summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChristine Franks <christyfranks@google.com>2017-07-18 23:30:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-18 23:30:29 +0000
commit6b43433062c0c6b08b486e3be428d57364338ad4 (patch)
tree5c3ccdbc41c9cebf1d6abde685fb752a9cbc666c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent68bedb03356d5ac7d7fa7b3adf6821b5af1cca4f (diff)
parent205585e5749976f66e93fc7827aa1e7da69b5e02 (diff)
Merge "Disable lock screen by default for demo users" into oc-dr1-dev
am: 205585e574 Change-Id: I05eeee1b997916e0f8fa86614aaac3d0e395a35c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions