| commit | 0ed895bcf6990e34d4898856e9339d1f77b0af54 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:36:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:54 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 30232c5702fb760b4114d0064ea16d5053f53a7c [diff] | |
| parent | 0437e34453bdb96dc31b902ec720c4fd827c3064 [diff] |
am 0437e344: am 3bb4dd0b: (-s ours) am b58498b7: am 817b9f10: Merge "resolve merge conflicts of 26786ad to studio-1.4-dev." into studio-1.4-dev automerge: bb09599 automerge: f0e710c * commit '0437e34453bdb96dc31b902ec720c4fd827c3064':