Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1

This commit is contained in:
Gloria Wang 2011-03-21 17:26:03 -07:00 committed by Android (Google) Code Review
commit 838c9844f7

Diff Content Not Available