| commit | f8a26e10faeb8bf788a2bfe4abb00a7be718c996 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:36:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:44 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 61b7250e3f1c9188230508362b91e9990c2b4679 [diff] | |
| parent | 895e6e0bbf90f42d124f6c6803fec480e197e5c8 [diff] |
am 895e6e0b: am be349e19: (-s ours) am 85ff8022: am 9747696c: Merge "resolve merge conflicts of 84da716 to studio-1.4-dev." into studio-1.4-dev automerge: a404a42 automerge: 3d14ed0 * commit '895e6e0bbf90f42d124f6c6803fec480e197e5c8':