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