| commit | b155ee3273aaead86e3781794edc918ccdb538e5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 27 21:32:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:32:10 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | f1fcdb1f15e409118fe13f5a2af71e53c8173c12 [diff] | |
| parent | 587d684c5b27180e6ac6d14ac1e5b8b73c05df61 [diff] |
am 587d684c: am b62c13f6: (-s ours) am e632015c: am 3c1a1ca5: Merge "Fix build" into studio-1.4-dev automerge: 52e2d8e automerge: 95f0c46 * commit '587d684c5b27180e6ac6d14ac1e5b8b73c05df61':