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)
1  2 
res/values/strings.xml

Simple merge