OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1985e38 2ca7add)
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package...
authorSimon Wilson <simonwilson@google.com>
Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)
* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
  DO NOT MERGE Put additional update package names in config.xml


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help