summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-13 22:51:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-13 22:51:41 +0000
commitcacf91e466584f1ff3b59b95f9a7e18d822243e5 (patch)
tree687d3c664dc6c016bb994d60152b3126bb01a871 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0357ea40768fb6c2f3f20a1345ac0b2fedb58049 (diff)
parenta5a732e8afe61a167639a961170345c9cb74fc92 (diff)
Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am: 55c7c9c2d4" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions