| commit | e5af6efa115f7a58a5ef7ef9aae9d0861527c310 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed May 11 18:02:35 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 11 18:02:36 2016 +0000 |
| tree | 651bb1851aee8bc38009bb837b2ec8f6773b94b9 | |
| parent | 613cc30b10d0c432516ee79461d3f5572298ea39 [diff] | |
| parent | fd6e87c2a7c8f451783a32fc6bf09633dd3308c7 [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