diff options
| author | Bart Sears <bsears@google.com> | 2015-08-13 05:46:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 05:46:16 +0000 |
| commit | 3ab3ffc646f311f03f464e175f0d4f73c79c0d68 (patch) | |
| tree | bebfe347321225c8a21ae464a0c11627e2042200 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 24cf83494844f1ce3c247660af61307366330c80 (diff) | |
| parent | b7ae19905a471b0e0c74cd76b9895cad93856deb (diff) | |
am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit 'b7ae19905a471b0e0c74cd76b9895cad93856deb':
Fix Keyguard drawn timeout
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions