| commit | 61b7250e3f1c9188230508362b91e9990c2b4679 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:36:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:43 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | de829f1b0466a0ae9f17589b5fc293e918230aeb [diff] | |
| parent | dfe6193abe250ae67c678ef2c47bae86213f04a1 [diff] |
am dfe6193a: am 27e88492: (-s ours) am 4e262555: am 03f32a0e: Merge changes I75516bf5,I9495cd2c into studio-1.4-dev automerge: da76865 automerge: 849e02a * commit 'dfe6193abe250ae67c678ef2c47bae86213f04a1':