OSDN Git Service

am 0e78f786: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:54:06 +0000 (10:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Jul 2010 17:54:06 +0000 (10:54 -0700)
Merge commit '0e78f786777a04af498b43564a8d6ed8e15e8940'

* commit '0e78f786777a04af498b43564a8d6ed8e15e8940':
  Change-Id: I68cc462aeb2460345a53bdb9941ce4bfc10456fb


Trivial merge