| commit | e8a4ea2bd5e593a9192d1511d047e582eaced2ec | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:36:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:00 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 10730c6901767b0304d8be470bbd7a60c5c87a02 [diff] | |
| parent | 00a83585a138db87b32b545c35746532bec2f2a6 [diff] |
am 00a83585: am 7501d45b: (-s ours) am 43f81deb: am 142bf875: Merge changes I1904b53d,I505fced0 into studio-1.4-dev automerge: f347050 automerge: 0cfd791 * commit '00a83585a138db87b32b545c35746532bec2f2a6':