OSDN Git Service

Merge "Encrypt inplace settings." into honeycomb
authorJason parks <jparks@google.com>
Thu, 20 Jan 2011 23:50:55 +0000 (15:50 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jan 2011 23:50:55 +0000 (15:50 -0800)
1  2 
res/values/strings.xml
src/com/android/settings/SecuritySettings.java

Simple merge