| commit | 76ae24d8608d0af4978216613ec138980e1edde7 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:15:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:15:46 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | ff3940b4f4268427bfd8012d3717360a8e850ad0 [diff] | |
| parent | db5eb0060390698e12562f73af66b18e56f7e898 [diff] |
am db5eb006: (-s ours) am ac1a5f03: am 674d2490: Merge changes I329c6475,I7b26dd66 into studio-1.4-dev automerge: 573805c automerge: 2527458 * commit 'db5eb0060390698e12562f73af66b18e56f7e898':