| commit | 5b13a6e5096d8a0868ed93c08f027aab8450936d | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:37:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:08 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 45f7b38ee1118789542549c6b45ab61cc546f0f9 [diff] | |
| parent | 84dbd57b31e06ad4150a3da1417c48eb522515c1 [diff] |
am 84dbd57b: am 715a72c2: (-s ours) am dc73e36f: am 1d6bc6e2: Merge changes I305329a1,I93a72da7 into studio-1.4-dev automerge: 6b5c8e2 automerge: dab8362 * commit '84dbd57b31e06ad4150a3da1417c48eb522515c1':