summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-12-11 00:06:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-11 00:06:53 +0000
commita349a9e71aecf93d7d6d7d3e0d93d3e06291a519 (patch)
treeb305b738170ccc76c3b1d6d2b7a2c944d79161e4 /include
parent5369b76963a344d08fda4532227a6f0da28fd23a (diff)
parent65c08ec82a11eeb2ea8b048935ddafc694fc0236 (diff)
downloadframeworks_base-a349a9e71aecf93d7d6d7d3e0d93d3e06291a519.zip
frameworks_base-a349a9e71aecf93d7d6d7d3e0d93d3e06291a519.tar.gz
frameworks_base-a349a9e71aecf93d7d6d7d3e0d93d3e06291a519.tar.bz2
am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236': Handle policy change while keyguard disabled
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions