diff options
author | Adam Powell <adamp@google.com> | 2016-05-26 01:21:19 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 01:21:19 +0000 |
commit | 528a5bd466a18f2d955ae364b0e8600b74fa790f (patch) | |
tree | 29a14e3dbd483924ee52a192befd39d8a2877cbc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1f4a0d178f5eb7ee85ac36f03cf8c937e8a12dcd (diff) | |
parent | bc983c443139c7b4605f98d56bd9ad7652a9938b (diff) |
Merge "N is API 24" into nyc-dev
am: bc983c4431
* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
N is API 24
Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions