tree 3ac28f7a7107fbe6f5e8fe3fce1a6b430f496f39
parent 78714c1edfcdefd83c03eb985d82e3d45ed7e26f
parent 3eb9f8326e6d72be671bf0226965ca3231a25d7d
author Xavier Ducrohet <xav@android.com> 1307635478 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307635478 -0700

am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.