| commit | e1d0e4a89e27e6a12c1dcdcc6f208af1a3bdfbe5 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:37:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:32 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 778cdbcc79e7bd2aabb32f02cf5ee92d87d58c1a [diff] | |
| parent | cbdbbd606c3fb1550140db21186f3333bf4ea564 [diff] |
am cbdbbd60: am 3a0e36ce: (-s ours) am 3b101d08: am 6ee4bf15: Merge changes I215bf219,I1d0a79e7 into studio-1.4-dev automerge: 9ba5510 automerge: 4527994 * commit 'cbdbbd606c3fb1550140db21186f3333bf4ea564':