diff options
| author | Lucas Dupin <dupin@google.com> | 2020-06-17 04:03:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 04:03:14 +0000 |
| commit | b360c34613975fe502773f53dd78cddf20cb58c5 (patch) | |
| tree | f4533c3be2ae84fa4dd2969beb57eb308da63769 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cd95ec32f66c70e928d8a4893411731ba4c48c8d (diff) | |
| parent | 92cd21045a2276450fdf4e0ea213e5fb16f056de (diff) | |
Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 9f562cceff am: 92cd21045a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820
Change-Id: I5fcd0baac1000855ada5b0714b5dd45ce5d9d533
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions