summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-26 11:16:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-26 11:17:01 +0000
commit5dc480b24e1df8daa0b5089eaf0523bdc0bd230d (patch)
tree6b847dfa0971a321e3846fec46e5e8c05a18a1d2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbc9d375b7cb8448abdc84e5720fd8140b6ad7e3a (diff)
parentb80351de5408e5e76638f9bee5021c02556453bc (diff)
Merge "Merge "Use correct user id when checking uri grants for notification." into nyc-dev am: 19d34821b9 am: eb6ce93432" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions