diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-20 14:15:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-20 14:15:59 +0000 |
| commit | 836b9d1c7a7b0bba7b9b58b6d4a1929e352b3b71 (patch) | |
| tree | fba37d7b4c8ce5dda3b4f8e25d3f8c1415675a49 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 67be3b034a9a36a6804f823f96f12c923da99d0f (diff) | |
| parent | 67e9113e76441564c4a94365fd50c0b500445c40 (diff) | |
Merge changes from topic 'am-993c43530b0f4dacbb88b40a1b1760de' into oc-mr1-dev-plus-aosp
* changes:
Keyguard: only show after screen fully turned off am: 4757c8ccf8 am: 793e0eea6a
StatusBar: Switch status bar to using the new lifecycles am: 731d4dfe60 am: be0f74979d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions