summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMarie Janssen <jamuraa@google.com>2016-09-21 01:34:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-21 01:34:29 +0000
commit7e5b9e3d326095d9c49fb968db015a69ab01b9c4 (patch)
treeec5026234c01dad59afc0e659fe9675c4a557b9c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5742a055e2b408a48b74ac950ca1d09fbeb7201f (diff)
parent9013d67f0c83dfae4bc3dea2f32df0b0fcc50c83 (diff)
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d
am: 9013d67f0c Change-Id: I410c28139316f4b9bef378d73ad8e39f83ae21df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions