summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2015-05-05 02:09:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-05-05 02:09:17 +0000
commit11ef4e013b424e358f4d9e85bef7a88ad2ecf273 (patch)
tree1b2287f19d512feea67f9e5a74127cb738898496
parent77ed70ae31789949100bc7c556192b99714b3faa (diff)
parent6bc9e0f21000703a8a3e231da9eda6415bdc9409 (diff)
downloadswt-11ef4e013b424e358f4d9e85bef7a88ad2ecf273.tar.gz
Merge "Fix gson dependency in IDEA project files." into studio-1.3-dev
automerge: 6bc9e0f * commit '6bc9e0f21000703a8a3e231da9eda6415bdc9409': Fix gson dependency in IDEA project files.
-rw-r--r--.idea/libraries/gson.xml (renamed from .idea/libraries/gson_2_2_4_sources.xml)6
1 files changed, 3 insertions, 3 deletions
diff --git a/.idea/libraries/gson_2_2_4_sources.xml b/.idea/libraries/gson.xml
index ad20fa4..717bb04 100644
--- a/.idea/libraries/gson_2_2_4_sources.xml
+++ b/.idea/libraries/gson.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
- <library name="gson-2.2.4-sources">
+ <library name="gson">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/google/code/gson/gson/2.3/gson-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/com/google/code/gson/gson/2.3/gson-2.3-sources.jar!/" />
</SOURCES>
</library>
</component> \ No newline at end of file