OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18828fa a8a974b)
am a8a974bd: am dd45a47b: Merge change I4d31288f into eclair
authorAmith Yamasani <yamasani@google.com>
Fri, 30 Oct 2009 02:54:53 +0000 (19:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Oct 2009 02:54:53 +0000 (19:54 -0700)
Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp

* commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e':
  Fix for 1974140. Delete entry if not valid on hitting home.

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

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