tree bf01111cc496cf7a819b903fb157dd5fdd6c1143
parent 041fd74beade4e95cff6157af9dadbf9a99b7fcf
parent 4c1e73b69a13a4f24a8fc123f599a9e9d8505525
author Xavier Ducrohet <xav@android.com> 1306169575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306169575 -0700

am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.