summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2020-06-18 14:26:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 14:26:24 +0000
commit0c6e01702b1608ec98f59cd460d6f08bf549a4c2 (patch)
tree8ae7d9a1d0192fceab791e9b6de7461ec08ae2eb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5454e69665a34ee54d844043bf152400f79aba09 (diff)
parent01b07e368fa4d3b82c10bb5a8f19bd78db349797 (diff)
Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820 Change-Id: Ib961eec96af375e61e28e1757f5deb6a8439d173
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions