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

* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-05-23 09:52:55 -07:00 committed by Android Git Automerger
commit 7e7703528c

Diff Content Not Available