tree 662e6a15ff9d526ed70163eee15d41cdd9360f45
parent ea182704b60551a9bd7760aa9d206ca7a7e407b8
parent 5b9ec6871afaf40325abe602cd1d29ddbd88cbb9
author Xavier Ducrohet <xav@android.com> 1306171320 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306171320 -0700

am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.