| commit | ff3940b4f4268427bfd8012d3717360a8e850ad0 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:15:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:15:44 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 242ab5a2f855215645bb0eca2541e9ac3dd4d0e4 [diff] | |
| parent | 49892747d0c21dc98e1c00aab0948ded7a43e403 [diff] |
am 49892747: (-s ours) am bd27b7bb: am d4a11eae: Merge changes Ib8cb7ba0,I7b025b06 into studio-1.4-dev automerge: b46406d automerge: 4ef1afd * commit '49892747d0c21dc98e1c00aab0948ded7a43e403':