OSDN Git Service

Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770
authorRicky Wai <rickywai@google.com>
Tue, 12 Apr 2016 11:20:54 +0000 (11:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 11:20:54 +0000 (11:20 +0000)
commite4b811fe6a6e7bd41b85b3c476e0fb2fad5fa056
tree24de391794b72c380019a20f368ce9b12ce72b1d
parent6322fa7e0c85186ebb4124c3eef5343194d3402a
parenta62dd8b1d116ca0f17a33551480f8173e1ff9b31
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770
am: a62dd8b

* commit 'a62dd8b1d116ca0f17a33551480f8173e1ff9b31':
  Hint user that fingerprint cannot unlock FBE keys

Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
res/values/strings.xml