OSDN Git Service

am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f0363844...
authorScott Main <smain@google.com>
Sat, 10 Apr 2010 18:40:08 +0000 (11:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 10 Apr 2010 18:40:08 +0000 (11:40 -0700)
Merge commit '479f4a5cc4db72024123d36145028fe557e72f98' into froyo-plus-aosp

* commit '479f4a5cc4db72024123d36145028fe557e72f98':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444


Trivial merge