diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 03:52:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-11 03:52:51 +0000 |
| commit | cd9e71744ed92d19b896ebb9c98135051d473229 (patch) | |
| tree | 0a74c559dd4c1f42c6393469eb3154d2d1c26a52 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 45d4d19fc584f44246f511f3ab203d23459fb99f (diff) | |
| parent | 3c0cd40a2315e38342e51e2a265087672ffcdf05 (diff) | |
Merge changes from topic "am-90f3bc3d5bbe49498428b40defa6b5a1" into qt-qpr1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2ab
[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING am: 4aced5d906
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions