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