diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-13 01:02:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:02:35 +0000 |
| commit | d59f5c02810095bba4bc7a47f9169655d4be7521 (patch) | |
| tree | 443dd9d1e052751a19031adf287e0e7da105cfd5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 73d9e1ce0bc8e4478b165fd5f550c99830fbcb57 (diff) | |
| parent | a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54 (diff) | |
am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit 'a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54':
Fix touch-to-wake while dozing
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions