diff options
author | Suprabh Shukla <suprabh@google.com> | 2017-02-02 23:07:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-02 23:07:36 +0000 |
commit | d9c81559436fea31767a7eca05a63060dff4d313 (patch) | |
tree | 49c3f6ba2d41551a97a195484ae36c3177b8a24b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 051f01700e9ac58236b819d5947c4d691b2318dd (diff) | |
parent | af85feef363b596cbac066d1eea8bf8c5df7807d (diff) |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am: af85feef36 -s ours
Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions