summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2016-01-26 20:34:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-26 20:34:20 +0000
commitcee0600bd9c9c9d7a7d777ca3621396c972783db (patch)
tree84d29e27a4e59f734bbcb2e732d446fd1cf3720d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent04785955b5be7dc1ba164a0ae02c306b4fdd680d (diff)
parentf5958497d36ac64ed1f2bbbd80cb0a3a24e94f13 (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 * commit 'f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13': [DO NOT MERGE ANYWHERE] Fix bodysensor permission
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions