summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Ady Abraham <adyabr@google.com> 2021-08-05 17:19:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-05 17:19:39 +0000
commit3c377a9b7b6065ff1ef30fa35a930dd7a473fa92 (patch)
treefaca9d1a327fa74c02106aac02617578c6d901c8 /tools/aapt2/ResourceTable.cpp
parent4c7e53d768b5245a68e47781482f626473569daf (diff)
parente42c6ed8d05413a30eba4041176b99f576d2bfce (diff)
Merge "DisplayModeDirector: proximity should not vote on doze" into sc-dev am: e8310817af am: e42c6ed8d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15378209 Change-Id: I34868db7b91356b1472fa4bcf341bb6fe691d67f
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions