summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2016-09-14 05:31:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-14 05:31:02 +0000
commit82979f27cbeefe39d654e3b19821ca21267f4474 (patch)
tree442eea142eb8be2871fde959105efef03115fd64 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8f56011a64cd80a2785b909e37eaf68eb974efc1 (diff)
parentae559dd8aa984413179c3c0de04d49c858f31b0a (diff)
Merge "Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am: 1bb0616c56 -s ours am: 04829c4ddd -s ours am: 603a2174e5" into nyc-mr1-dev-plus-aosp
am: ae559dd8aa -s ours Change-Id: Iaea4061c34503721c09bc7d451dc12f08de9cfce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions