summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2020-03-24 22:46:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-24 22:46:51 +0000
commit7cb34c50669e493399ee368d731102c74b62b858 (patch)
treef0103452b4498edf47d9d1f4709c254ad2c3bc30 /libs/androidfw/AttributeResolution.cpp
parentee6e043a0f4ec05a8a1dc02b9d0819834f0abdd7 (diff)
parent774d5fe0cd2dda5eca2679ee37c6ad8a39d2ca26 (diff)
Merge "Ensure that the shortcuts added to conversations are longlived" into rvc-dev
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions