Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325"

This commit is contained in:
Robert Ly 2011-08-29 14:30:48 -07:00 committed by Android (Google) Code Review
commit 6552e46f99

Diff Content Not Available