OSDN Git Service

Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
authorLucky Zhang <luckyzh@google.com>
Tue, 2 Dec 2014 23:45:55 +0000 (23:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Dec 2014 23:45:56 +0000 (23:45 +0000)
commit91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19
treefcfe670098f0750c65df8bf24d0924fda87d03f3
parent794cbd70fa3d101b1a8a587faf327c7700c946eb
parent3bcea0289b90dd543a2e7f4ea35a5b6ccdb95e14
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
res/values/strings.xml