summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-09-03 19:46:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 19:46:41 +0000
commit54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481 (patch)
tree5a536590693eb4d685e155f9836c1614524a7237 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb90f1de216ec8be27eebd17b5f3c6a87ee084e75 (diff)
parent95200e6f4eb34818ac0b652167cffacfcfb4fdff (diff)
am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '95200e6f4eb34818ac0b652167cffacfcfb4fdff': Poke fingerprint timeout when vold password is correct
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions