diff options
| author | Ricky Wai <rickywai@google.com> | 2016-04-15 13:52:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-15 13:52:15 +0000 |
| commit | 82893ee6da8cf5c22eb518a9d46412db697abc26 (patch) | |
| tree | b58e050f228bf332b80331d4b60e2b93a0077d3a /docs/html/sdk/api_diff | |
| parent | cda498e72ae41b02be39d60d936bdce071dc9c81 (diff) | |
| parent | 29e2e8ca33f349d9baa08741fb290cbe0c562bdf (diff) | |
Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev am: a4c0b1d
am: 29e2e8c
* commit '29e2e8ca33f349d9baa08741fb290cbe0c562bdf':
Fix cannot unlock keyguard when work challege is unified and work mode is off
Change-Id: Ie3c29865e8f3fdd5acffec72c3b309ce11f7b767
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions