commit | 9b7ec7ce42ea451ff62683e36e88884b8cd847b6 | [log] [tgz] |
---|---|---|
author | Victor Chang <vichang@google.com> | Fri Apr 22 11:11:08 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 22 11:11:08 2016 +0000 |
tree | 6a392154c41479d4b1e032601a72f822ecb9a360 | |
parent | 2507fab7cc34507b14f996cc0d46265baf9adb87 [diff] | |
parent | bf35a4d024667a16c190c670e6ed28a9c68036fc [diff] |
Merge "Deleting lock screen clears all CA approvals" into nyc-dev am: c0440e5f4d am: bf35a4d024 * commit 'bf35a4d024667a16c190c670e6ed28a9c68036fc': Change-Id: Idc57203e071f46c499a857fe7dc8f1a32b4e180a