diff options
| author | Selim Cinek <cinek@google.com> | 2017-08-04 19:59:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-04 19:59:54 +0000 |
| commit | 7315623761f6404029b12e50eba521fe6669bcb4 (patch) | |
| tree | 7cc3fc6e5b76569248378407b372b004bb003d28 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0a19be5607274426897d0f8479e3fb30e58be0e2 (diff) | |
| parent | fb52158e8575602635577c3c2e5fe5159921b3a7 (diff) | |
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
am: fb52158e85
Change-Id: I3e4abb55f30663ce7953c324ce8ad5220ed9a1c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions