summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herman <davidherman@google.com>2015-08-27 21:37:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:37:28 +0000
commita8ba12bda88c4ab0584eeb2e45d143ef2a125764 (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parenta740f41769f88c25cc87db5596c5102a67bbdf31 (diff)
parentddb4b7f9f221baf91c27729417e55262560ab104 (diff)
downloadbase-a8ba12bda88c4ab0584eeb2e45d143ef2a125764.tar.gz
am ddb4b7f9: am 1bf0c8b5: (-s ours) am a4f904ca: am 3b2874fc: Merge "Update Google Maps Activity template for latest API changes." into studio-1.4-dev automerge: 704a176 automerge: 429b3f0
* commit 'ddb4b7f9f221baf91c27729417e55262560ab104':
0 files changed, 0 insertions, 0 deletions