Merge "typo" into jb-mr2-dev

This commit is contained in:
Scott Main
2013-06-22 03:26:26 +00:00
committed by Android (Google) Code Review