OSDN Git Service

am 20777fae: am 584bce31: Merge change I09282f5b into eclair
authorRomain Guy <romainguy@android.com>
Thu, 5 Nov 2009 04:57:27 +0000 (20:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 04:57:27 +0000 (20:57 -0800)
commit4deb52f3c1a645ae2daa8dd31e72460ead2cd372
tree536df8901de754657461d583031836636836d0d0
parent2806a8f57bfc0a311ddaa9e31a21662ca54ff5e2
parent20777fae8757036d7d526cf74673d30993b77ac5
am 20777fae: am 584bce31: Merge change I09282f5b into eclair

Merge commit '20777fae8757036d7d526cf74673d30993b77ac5' into eclair-mr2-plus-aosp

* commit '20777fae8757036d7d526cf74673d30993b77ac5':
  Fix the build (hopefully.)