OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21d9dce 7077e64)
am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs
authorLifu Tang <lifu@google.com>
Mon, 21 Oct 2013 23:06:09 +0000 (16:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Oct 2013 23:06:09 +0000 (16:06 -0700)
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs

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