diff options
| author | Selim Cinek <cinek@google.com> | 2017-07-27 21:25:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-27 21:25:48 +0000 |
| commit | bbc80d97888aef8f988b7ef1e8725c45555f42cc (patch) | |
| tree | 9185c4b2fec9dbbdb4fc0313dd733a91269b594a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 12c586c5be1462f82829ecf9c8d2c28cbeda1e5c (diff) | |
| parent | 02be5d1ddde77b01d79231dc01838ce81cf8bf45 (diff) | |
Merge "HeadsUpManager: escalate via wakefulness lifecycle instead of broadcast" into oc-dr1-dev
am: 02be5d1ddd
Change-Id: I0e3d90ebb299cae9268f3d49820776bb7f309991
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions