OSDN Git Service

Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
authorPaul Lawrence <paullawrence@google.com>
Thu, 24 Jul 2014 21:45:01 +0000 (21:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 20:48:02 +0000 (20:48 +0000)
commit832ad7206299be6db94e82e2387c0fcf8df53e7e
treead171690fcd9c5e94cf4d0b8b69cf6acfb4f6168
parent6cef9d23b8572d8bd87329999f10286e29a861c0
parentbd4c3210e1e0d6f58b2a5857032a2dacb316be98
Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
res/values/strings.xml