diff options
| author | Selim Cinek <cinek@google.com> | 2017-07-27 21:23:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-27 21:23:34 +0000 |
| commit | a385f7d2ff14472991156afe1e5ad421fba86301 (patch) | |
| tree | 94290a39b16ff1c79a72fc81ffde346f20df4384 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 53a3bcdb149b69a6127683fd3be6efb35a059a47 (diff) | |
| parent | 02be5d1ddde77b01d79231dc01838ce81cf8bf45 (diff) | |
Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev
am: 02be5d1ddd
Change-Id: Ice2cd4a549cdfd4a39c331d9d8063476ec48f518
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions