| commit | 778cdbcc79e7bd2aabb32f02cf5ee92d87d58c1a | [log] [tgz] |
|---|---|---|
| author | David Herman <davidherman@google.com> | Thu Aug 27 21:37:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:30 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | a8ba12bda88c4ab0584eeb2e45d143ef2a125764 [diff] | |
| parent | a2b605aa07cb162ef08d016ac2052375e840ad3f [diff] |
am a2b605aa: am cd63d5ec: (-s ours) am f4d12486: am 61774329: Merge "Add Google Map Activity template for Android Wear." into studio-1.4-dev automerge: a0d70fb automerge: b1ee220 * commit 'a2b605aa07cb162ef08d016ac2052375e840ad3f':