summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2020-11-05 04:01:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-05 04:01:16 +0000
commit64363d8b8d1612b5b3ced411a8894db735fa39df (patch)
treeac75bffe7210c6bbef42193087e38d0b2da5372e /libs/androidfw/ConfigDescription.cpp
parent996fbcaba3f46d7c8c82ffe35b6d789aa4f45e33 (diff)
parente666aa1e3d43b29fec85860a6b8c3556cab9aa20 (diff)
[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a am: e666aa1e3d -s ours
am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068 Change-Id: If6eb17c8b328ea801a2825e93391a9bd21925072
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions