diff options
| author | Quang Luong <qal@google.com> | 2020-07-09 18:13:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 18:13:45 +0000 |
| commit | 935fff095c0e5c2df1191a42e81940588130411f (patch) | |
| tree | eecdcb22d54f22067f449ab76e71b65da9123117 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e9a117eb8542f279e5aae98794f818134a8c4d85 (diff) | |
| parent | 261b4542bd23a3149167d419907b2b9a4189f966 (diff) | |
Merge "Revert "Migrate from old key when combining device and media data"" into rvc-qpr-dev am: d4e95a3913 am: 261b4542bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118834
Change-Id: I362d411175abe745a03062535d7724307f1c082e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions