summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-09-26 19:53:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-26 19:53:14 +0000
commit19f68fb871ea49ed4835c3d13f526d4872235f25 (patch)
tree6844ef538a3a636c228371d16925a7f684af0ce8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9584232706aa28caf380bd9c9b27c22948e24c4f (diff)
parentb30ea7f62c384962cbd1c005712d91dbc2aa9e91 (diff)
am 8d1b0035: am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev
* commit '8d1b0035aa8fd147f0f6841cfac1c48158b78c9e': Don't start the keyguard until boot is done.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions