summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-08-27 21:57:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:57:55 +0000
commit645379e96315acddfc57d1f4851d59f61a07fa54 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentc2609f9572772c1c842c20dc972e1f6bee6b82ae (diff)
parentbc7181b55ee24dd4cd878a0867a63fede3fb0d97 (diff)
downloadidea-645379e96315acddfc57d1f4851d59f61a07fa54.tar.gz
am bc7181b5: am a1aa7044: (-s ours) am 947e087f: am e193d168: Merge "Implement IdeaAndroidProject#getTargetSdkVersion." into studio-1.4-dev automerge: bfb179a automerge: 291e6d0
* commit 'bc7181b55ee24dd4cd878a0867a63fede3fb0d97':
0 files changed, 0 insertions, 0 deletions