| commit | fbb83b993b5a112e7badbcd1785a86b931c8a0f1 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:37:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:24 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 8567f8326b6a1195d0a964932b3cc06f94f492bf [diff] | |
| parent | 611d238af55a82ba75637433dc97549307aecab9 [diff] |
am 611d238a: am 5029b3ed: (-s ours) am d726e775: am 69dfe09e: Merge "Fix packageConfig description" into studio-1.4-dev automerge: 9303853 automerge: ad9bfbd * commit '611d238af55a82ba75637433dc97549307aecab9':