| commit | 91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19 | [log] [tgz] |
|---|---|---|
| author | Lucky Zhang <luckyzh@google.com> | Tue Dec 02 23:45:55 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 02 23:45:56 2014 +0000 |
| tree | fcfe670098f0750c65df8bf24d0924fda87d03f3 | |
| parent | 794cbd70fa3d101b1a8a587faf327c7700c946eb [diff] | |
| parent | 3bcea0289b90dd543a2e7f4ea35a5b6ccdb95e14 [diff] |
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev