summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-11-13 19:02:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-13 19:02:45 +0000
commita1ace2219a8598e48b70906a96a012a9016ea5f8 (patch)
treea2d0ab2ba36fca9bf7c95ebc28f5007dd3fc80de /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd7532bf4fcfcd78b9c0dd9f906c3e695b7c74a96 (diff)
parentd2b3d8bff1deb5a699a97dd9b3377ff02211e6c6 (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
am: d2b3d8bff1 -s ours * commit 'd2b3d8bff1deb5a699a97dd9b3377ff02211e6c6': 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