summaryrefslogtreecommitdiff
path: root/tools/aapt2/SdkConstants.cpp
diff options
context:
space:
mode:
author Josh Tsuji <tsuji@google.com> 2021-08-06 18:23:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-06 18:23:53 +0000
commitd273ab14ac48f523803ce7284e8731d78abbb80e (patch)
tree35845ecf4062e9ff4fb828a4eb6ea6769a0d6789 /tools/aapt2/SdkConstants.cpp
parent8d7de31c0f3e8708fb5884329a2bce87883a3d58 (diff)
parent866f2aa92a6595085a877efaeda8b7084367f2e9 (diff)
Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b47e am: 1fd12a80bb am: 866f2aa92a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476108 Change-Id: Ic4b679623687da85dcb7bb7e1861d5ac75108731
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
0 files changed, 0 insertions, 0 deletions