diff options
author | Hai Zhang <zhanghai@google.com> | 2021-02-26 17:23:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 17:23:48 +0000 |
commit | 794fdfa8c694e22d7f77ad7ee95766512d209cad (patch) | |
tree | 68414b5d06f59e883b7ddfa444668e0560b097cb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f9b529aca3b97b6a656f886911cc8e42b891db0e (diff) | |
parent | c5ad2d0f616664b1380eaed2f70b23835dae8e8e (diff) |
Merge "Match both direct boot aware and unaware when updating default home." am: a10e9ca595 am: 14cb8a5290 am: c5ad2d0f61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554659
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib59de3768ed5f4b0173f82f5a8a278f455244b19
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions