OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 621d0be 06952d9)
am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
authorMike Lockwood <lockwood@android.com>
Mon, 17 Aug 2009 17:59:02 +0000 (10:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2009 17:59:02 +0000 (10:59 -0700)
Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'

* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
  DO NOT MERGE - cherry-picked from master:


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help