OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce0a7b2 25c52b7)
am 25c52b70: am 340c5c42: Separate the Settings activity name into two different...
authorEric Fischer <enf@google.com>
Fri, 1 Oct 2010 19:06:18 +0000 (12:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Oct 2010 19:06:18 +0000 (12:06 -0700)
commit4e6466f5ef16b2e34892d694e24317436966a4f9
treeb8d56464ab605bfe15001a7d2eafaa0c606234b6tree | snapshot
parentce0a7b2df0d6ce3d5a9bf063cde2e23b92ec7002commit | diff
parent25c52b70faceb24cade0f5480c372de3f47bdf79commit | diff
am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings.

Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.
AndroidManifest.xml diff1 | diff2 | blob | history
res/values/strings.xml diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help