diff options
author | Jorim Jaggi <jjaggi@google.com> | 2017-05-23 11:10:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-23 11:10:57 +0000 |
commit | 53b96948f4369803d42766ec82ac6dda62db5eb1 (patch) | |
tree | 56a1cfd9006776a3a49a60f65de6d004379153e3 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 45956cfa462352d6fe1214741832385c2fa50172 (diff) | |
parent | ff389264d9abd3278247a93d1d518882407f9cfc (diff) |
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am: ff389264d9
Change-Id: I557863570a252fc84b76198a4acf0534a55af47c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions