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)
commit8daf64f2256fe29820ac6209695c77bcd9f9958b
tree1f0ad0c86e5e44a8785f8b94fdf00d328cdf5421
parent1b632250de5ab83959a2a3565ed7b0f6df7eb016
parentcde8474ebe87533a45c250297097e908b1f4e238
am cde8474e: (-s ours) Cherrypick 26d92b from master for r14. do not merge.

* commit 'cde8474ebe87533a45c250297097e908b1f4e238':
  Cherrypick 26d92b from master for r14. do not merge.