OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba61aaa b593a62)
resolved conflicts for merge of b593a628 to master
authorGilles Debunne <debunne@google.com>
Thu, 26 May 2011 17:35:38 +0000 (10:35 -0700)
committerGilles Debunne <debunne@google.com>
Thu, 26 May 2011 17:35:38 +0000 (10:35 -0700)
Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6

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