OSDN Git Service

am 0f2c3056: (-s ours) Cherrypick d7b602 from master. do not merge.
authorTor Norbye <tnorbye@google.com>
Thu, 29 Sep 2011 21:37:07 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 21:37:07 +0000 (14:37 -0700)
* commit '0f2c305640a83b480691dc9002eb2ff5c808dff2':
  Cherrypick d7b602 from master. do not merge.


Trivial merge