OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c467bc 06a314d)
am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
authorAmith Yamasani <yamasani@google.com>
Fri, 17 Oct 2014 21:08:11 +0000 (21:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Oct 2014 21:08:11 +0000 (21:08 +0000)
* commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb':
  Fix some strings for the encryption stuff.

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help