tree fcf60e712c8ec063d65d20af892cd7fd3e822c75
parent 81877d0fdad84fae9d40bd027b1d9742d6a1b9ff
parent 8d5e8672993b1438ad22193b8895c09172dd5dd2
author Xavier Ducrohet <xav@android.com> 1309312689 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309312689 -0700

am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.