summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-20 02:45:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 02:45:49 +0000
commit0eb6586beff3974361257e22ca421ba5fb25b19b (patch)
treeaae11da3eaba92e28506ece4223970ff4c98e7b9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentafa9b6fd39fc4976eeb3684458a6ecf41ec7373a (diff)
parenta0d5727078bdb47f19613b9c73e5d973281609f5 (diff)
am a0d57270: am e46b5b48: am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
* commit 'a0d5727078bdb47f19613b9c73e5d973281609f5': Fix jank in wake-and-unlock while pulsing Don't call authenticate immediately after getting valid fingerprint
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions