Merge "Several API changes as requested by ES:"

This commit is contained in:
Daniel Lehmann 2011-08-14 16:01:59 -07:00 committed by Android (Google) Code Review
commit db22472d9c

Diff Content Not Available