| commit | 6b6d5dbbb2cc72da1d2db8593357389b2a338b23 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:16:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:16:13 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 1a100286918639676c3383871c195e6d785ba26b [diff] | |
| parent | b59c8a98a338b1db5283c12e7a22f0c70cce8a00 [diff] |
am b59c8a98: (-s ours) am 80fb65f8: am 83237727: Merge changes Id0107ca7,I7b1e1396 into studio-1.4-dev automerge: 135b1b0 automerge: a591bd8 * commit 'b59c8a98a338b1db5283c12e7a22f0c70cce8a00':