OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da7eb06 d292799)
am d2927990: (-s ours) am 69827524: Try to fix bug3119318 without breaking the build...
authorRoy West <rwest@google.com>
Fri, 22 Oct 2010 00:59:54 +0000 (17:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 00:59:54 +0000 (17:59 -0700)
Merge commit 'd2927990ffe0d8ac385e16a38c189ace00065cff'

* commit 'd2927990ffe0d8ac385e16a38c189ace00065cff':
  Try to fix bug3119318 without breaking the build this time


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