| commit | 1c82fc713d150f5ae0abff0ac6a6571fe226f9b9 | [log] [tgz] |
|---|---|---|
| author | Chris Warrington <cmw@google.com> | Thu Aug 27 21:35:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:35:34 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | f47eaac185fa71315b898565df43e696ecfd8d6a [diff] | |
| parent | 4eff88afcd1f56a5b08b3e235de702f97055c908 [diff] |
am 4eff88af: am e2c12f64: (-s ours) am f53c76df: am e594a5d5: Merge changes I2e41f33a,I9c5bded1 into studio-1.4-dev automerge: 87cab50 automerge: d3947f9 * commit '4eff88afcd1f56a5b08b3e235de702f97055c908':