summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-11-13 19:01:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-13 19:01:25 +0000
commitd7532bf4fcfcd78b9c0dd9f906c3e695b7c74a96 (patch)
treea2d0ab2ba36fca9bf7c95ebc28f5007dd3fc80de /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc90d2b6b3d4381c119ef35e853f1204e7ebc8870 (diff)
parentef5feb290a325a4943d2dea74f5a1f4844567bef (diff)
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 am: 3bab0fd4f7
am: ef5feb290a -s ours * commit 'ef5feb290a325a4943d2dea74f5a1f4844567bef': 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