tree 6a392154c41479d4b1e032601a72f822ecb9a360
parent 3bbc9f0c0dee3158efd977f77bec7b59e9fabe68
parent 9b7ec7ce42ea451ff62683e36e88884b8cd847b6
author Android Build Merger (Role) <android-build-merger@google.com> 1461323494 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461323496 +0000

Merge "Merge "Deleting lock screen clears all CA approvals" into nyc-dev am: c0440e5f4d am: bf35a4d024" into nyc-mr1-dev-plus-aosp