summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-11-13 18:51:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-13 18:51:18 +0000
commitd2b3d8bff1deb5a699a97dd9b3377ff02211e6c6 (patch)
tree0f67b68a662746c23e30794ede760fa69956a885 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentef5feb290a325a4943d2dea74f5a1f4844567bef (diff)
parent20ba5c919bb97bb922919a34b3a081ea26b25000 (diff)
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef
am: 20ba5c919b * commit '20ba5c919bb97bb922919a34b3a081ea26b25000': DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions