Merge "bug_3259956 and bug_2166704"

This commit is contained in:
Romain Guy 2010-12-08 16:50:57 -08:00 committed by Android (Google) Code Review
commit d00904ad00

Diff Content Not Available