OSDN Git Service

am 3f05dce5: (-s ours) Cherrypick fcd339 from master. do not merge.
authorTor Norbye <tnorbye@google.com>
Thu, 29 Sep 2011 21:38:12 +0000 (14:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 21:38:12 +0000 (14:38 -0700)
* commit '3f05dce571bfedfdabf6b1f7d8f8a1c05c62317e':
  Cherrypick fcd339 from master. do not merge.


Trivial merge