OSDN Git Service

am cde8474e: (-s ours) Cherrypick 26d92b from master for r14. do not merge.
authorXavier Ducrohet <xav@android.com>
Fri, 7 Oct 2011 02:36:05 +0000 (19:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Oct 2011 02:36:05 +0000 (19:36 -0700)
* commit 'cde8474ebe87533a45c250297097e908b1f4e238':
  Cherrypick 26d92b from master for r14. do not merge.


Trivial merge