OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 898c7e1 38947dd)
am 38947ddc: Fix the build - doh.
authorMike LeBeau <mlebeau@android.com>
Tue, 30 Mar 2010 21:53:38 +0000 (14:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Mar 2010 21:53:38 +0000 (14:53 -0700)
Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken

* commit '38947ddcfb2411d380d631ebfc29d66b11821879':
  Fix the build - doh.

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