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