tree c2e941e5492128808d6951a2f584e68a3e369e2c
parent adf5914b390061e48a86c9f55e68899cfa526841
parent 155cf6c1e191bb03fe24db8663715862d8e6a43d
author Xavier Ducrohet <xav@android.com> 1309312577 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309312577 -0700

am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.