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