diff options
author | Sherry Huang <huangsherry@google.com> | 2019-08-05 19:35:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 19:35:57 -0700 |
commit | 102d213646eb9f14209ac1861d01ee85dfe118bd (patch) | |
tree | 6e6cf7eb425971a11e87a585fdb1e9887640e04e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 568706949ccae4d42be86e50a4b77fdb4eb0a300 (diff) | |
parent | 4c42353fca5c98e15f03ebc20a5f29f9fd8f09ce (diff) |
Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2c1
am: 4c42353fca
Change-Id: I4f9311ba3c3fc473ec2f0666508af8e05038250e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions