| commit | 9f5dcecc4a3c1100d144c343a9543aed92b7e073 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 22 11:11:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 11:11:36 2016 +0000 |
| tree | 6a392154c41479d4b1e032601a72f822ecb9a360 | |
| parent | 3bbc9f0c0dee3158efd977f77bec7b59e9fabe68 [diff] | |
| parent | 9b7ec7ce42ea451ff62683e36e88884b8cd847b6 [diff] |
Merge "Merge "Deleting lock screen clears all CA approvals" into nyc-dev am: c0440e5f4d am: bf35a4d024" into nyc-mr1-dev-plus-aosp