OSDN Git Service

am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt...
authorPaul Lawrence <paullawrence@google.com>
Thu, 24 Jul 2014 23:41:30 +0000 (23:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 23:41:30 +0000 (23:41 +0000)
commit5a67abbbdd62f8e093b5c50fb73bde976e5e5e4a
tree9e7b5c7d1dc712744a6845cc0d67599e4aa5eab8
parent479f70cd022aa20a292797140ebd9c83a6d3d044
parenta6ce40f461672fdbfef611bfcc90a7578b18b70c
am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
  Show countdown of remaining decrypt attempts before wiping device
res/values/strings.xml