| commit | 66df39dfadd8af6b5a75474ef5e72637b09b5b5c | [log] [tgz] |
|---|---|---|
| author | Ricky Wai <rickywai@google.com> | Wed May 11 18:05:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 11 18:05:53 2016 +0000 |
| tree | 832e2fa622e31714b447fad8e8445e65cbce1204 | |
| parent | b750ff95e8803446ee8f9232c292f639f02662aa [diff] | |
| parent | e5af6efa115f7a58a5ef7ef9aae9d0861527c310 [diff] |
Merge "Merge "Use userHandle not credentialOwnerUserId to check if it needs to show lock" into nyc-dev am: ca34ab06ec am: 3bb6351a4e" into nyc-mr1-dev-plus-aosp am: e5af6efa11 * commit 'e5af6efa115f7a58a5ef7ef9aae9d0861527c310': Change-Id: Ia06fe0d4e928b30644e3320d3355e46daa860a4a