summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-02-14 18:09:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-14 18:09:52 +0000
commit4146367596100a039c69729d9c76a9be1a3e1f53 (patch)
treecb487b211a6cbc4aded48374812189bacda5e1a0 /tools/aapt2/ResourceParser.cpp
parentfa90052512967f2b1b6fcb2339ff6962bdb2f554 (diff)
parentec3dcda976d7e6ea3796fc9cd0260366711e350f (diff)
[automerger skipped] Merge "DO NOT MERGE DozeScreenState unregisters for AuthControllerCB" into sc-v2-dev am: ebf49d75fc am: ec3dcda976 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16838784 Change-Id: I2365893c35d0b303667cdfba5f2d9004b76f22a6
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions