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