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