tree fcfe670098f0750c65df8bf24d0924fda87d03f3
parent cbf347c42d06e27785ccde70763a2c4dbc45542d
parent 91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19
author Lucky Zhang <luckyzh@google.com> 1417564387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417564387 +0000

am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev

* commit '91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19':
  [FRP] Show FRP warning when disabling secure unlock