| commit | e07668800637724072149e394fc5f57a38bd9575 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:37:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:10 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 5b13a6e5096d8a0868ed93c08f027aab8450936d [diff] | |
| parent | 0baf42f0ee3e44c5a1745304163590d02b9f71dd [diff] |
am 0baf42f0: am b701c7ae: (-s ours) am dee540e7: am e4866794: Merge "Rename PackageSplitRes task to java" into studio-1.4-dev automerge: 2db322b automerge: 96e319a * commit '0baf42f0ee3e44c5a1745304163590d02b9f71dd':