summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2016-01-26 21:57:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-26 21:57:26 +0000
commit16726c5c762e86e05e1c45eb25b7c83ffb393958 (patch)
treeb7d06495b09030e507a9c8f23452112180b18e81 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent58941094d47deefffabc0222f96ca6e40148d83b (diff)
parentcee0600bd9c9c9d7a7d777ca3621396c972783db (diff)
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours am: 3e413dfcdd -s ours am: f5958497d3 -s ours
am: cee0600bd9 -s ours * commit 'cee0600bd9c9c9d7a7d777ca3621396c972783db': [DO NOT MERGE ANYWHERE] Fix bodysensor permission
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions