diff options
author | Christine Franks <christyfranks@google.com> | 2017-08-10 05:38:00 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 05:38:00 +0000 |
commit | 2189999c61fa9d4d2fde47ea75f8dbae72ffb7e1 (patch) | |
tree | c6f851660f5466fe2a620df8754d5b81810f31c6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f3b6768601b466aa8d200a88e504a910b7e76981 (diff) | |
parent | 88710dead09434df19f872e5114f19e09680323c (diff) |
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0
Change-Id: I7b3aae902eebd27590e4799408e941ee7761b834
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions