diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-09 18:55:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-09 18:55:20 +0000 |
| commit | 1fdd2065836d05f3f634b192fb8dbf8f1120a0f5 (patch) | |
| tree | 3be36a764c1c533ffcadb12947e9168b772ba49d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4e803358fe026e70034d78a14baf5cc3877d4e4d (diff) | |
| parent | 404943ae04eb846525257667b9a8264a155cd0f1 (diff) | |
Merge changes from topic 'am-de733d91cb0341aeb2ef16f880922bbc' into oc-mr1-dev-plus-aosp
* changes:
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565 -s ours am: 4542686e42 am: c915b7f703 am: 54ad8c1f15 am: b380388108
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours am: 5d60709dc3 am: 17669d31df am: 5043ac7af3 am: 1b7fdf0f3f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions