commit | 19928eac463608298ecc8623aca16728c1497881 | [log] [tgz] |
---|---|---|
author | Raymond Chiu <chiur@google.com> | Thu May 14 04:02:03 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 14 04:02:03 2015 +0000 |
tree | bde6e4822673dfdfe1330ea61e209e64e61c93f4 | |
parent | e49a6e9d621bb2f1de8f21f945008c0fc7949149 [diff] | |
parent | 06c31655b5b2f8a476e824ca1d5b05f86bddcec8 [diff] |
Merge changes I51e9bcff,I42ade83f into studio-1.3-dev automerge: 06c3165 * commit '06c31655b5b2f8a476e824ca1d5b05f86bddcec8': Convert Base and AndroidComponentModelPlugin to java. part2 Convert Base and AndroidComponentModelPlugin to java. part1