summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-17 23:16:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-12-17 23:16:46 +0000
commitb1ae2f165e821f4e619ed59096d7494a790747f1 (patch)
treeed924f587123af3ddd040dd7ec612c6aea7a9405 /tools/aapt2/diff/Diff.cpp
parent0764ec680f2ab7e8f264fa7514b3853fe000bae9 (diff)
parentd178b046dedab35b8be34d1b0283db19101ea039 (diff)
Merge changes from topic "am-9ddc710c928c456fba0d718c70891b63" into rvc-qpr-dev-plus-aosp
* changes: Merge "DO NOT MERGE port power tap gesture logs to new standard" into rvc-qpr-dev am: b5a99ff8a1 DO NOT MERGE port power tap gesture logs to new standard am: dcccb262b2
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions