summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Greg Plesur <plesur@google.com> 2016-11-03 20:15:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-11-03 20:15:21 +0000
commit343dbac2e0519f0dda41eb9337957b35f53098a9 (patch)
treebc5beaa75d94235ca987a090a7f24cd9e1aa51bd /libs/androidfw/AttributeResolution.cpp
parent0d3f740316abb91dff0eeb1ddbd3c78112316939 (diff)
parenteb2e45369a92548e34b664d466d0578f966f7cef (diff)
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions