OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1fbc280 54a4a66)
am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
authorRobert Greenwalt <robdroid@android.com>
Mon, 7 Dec 2009 23:36:25 +0000 (15:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Dec 2009 23:36:25 +0000 (15:36 -0800)
commitdbf68aa372078f4f55a267e1eb182dd360384467
tree82532532c7c3191e618990374525c0353f287eaatree | snapshot
parent1fbc280dac0ce5089ff1491612944344af8d72b4commit | diff
parent54a4a66d38eff838d6d1fb3d0ede203aceb750c3commit | diff
am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair

Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp

* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
  DO NOT MERGE  Reverting change I53e91db7.
frameworks/base
About OSDN
Find Software
Develop Software
Help