summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-07-07 20:58:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-07 20:58:58 +0000
commit2642ae57ebc787017819dc3bfcf66992c8aa04a8 (patch)
tree8baf277458ca884913503d7af8d52aee44314fca /tools/aapt2/java/JavaClassGenerator_test.cpp
parent012f8669967b996b2f0b67f7ce431b31e7fa1174 (diff)
parent663cfc0f8d94a14e79960a4ff801c6a7c5930d87 (diff)
Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev
am: 663cfc0f8d Change-Id: I5dbe4256bc61672658b0e755d1fa4c5cd36e140a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions