summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2016-07-15 16:20:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-15 16:20:45 +0000
commit65aeef9d87f6c1898f7f0243b1c6b988960460af (patch)
treeb7daa350b884d5b9aeadbe43222328e5dd701d58 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4481b51667c94d778dc78126c79cd4856720654c (diff)
parent28763c5a777e2874a84774d836e7bddd01cd5d2b (diff)
Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev
am: 28763c5a77 Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions