summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-12-16 00:54:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 00:54:59 +0000
commit465d123464eadf180b618164b2ed23702bca3d86 (patch)
tree614c34e9a5520f0d4a6549a7462c627feab860f0 /tools/aapt2/java/JavaClassGenerator.cpp
parent93c736b3daa9b715814dd20892c1f41b5348f575 (diff)
parent0f0e85a68961e303ac85d31fb36ec8384277349d (diff)
am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev
* commit '0f0e85a68961e303ac85d31fb36ec8384277349d': AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions