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