summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Josh Tsuji <tsuji@google.com> 2022-03-02 21:17:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-03-02 21:17:23 +0000
commit49ededb26ddca4beed850150b03409f017a1fd83 (patch)
tree0b75acb8c7e5c3b54f4b45fe5fcfd87b7a1700c8 /libs/androidfw/AttributeResolution.cpp
parenta53e79405197b7e053e158da1cecec916282aec4 (diff)
parent346f9c19bf054317b78514c5e52fbb6b66bc6d1e (diff)
Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp
* changes: [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3 Don't re-hide the keyguard if it isn't showing.
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions