| commit | 9d951b545503c1e6fb049dae682763210f9730a8 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:36:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:05 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | eafe95b5645211b0d9e056e9ebcca7811c36d086 [diff] | |
| parent | d0e6489b5d56efd0b580d15b39658b736116ec13 [diff] |
am d0e6489b: am 1a842740: (-s ours) am 6a4fe1df: am a2efe3d6: Merge changes I107ec572,I75d9d3ee into studio-1.4-dev automerge: a6d81db automerge: d197a2d * commit 'd0e6489b5d56efd0b580d15b39658b736116ec13':