am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.

* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
This commit is contained in:
Dianne Hackborn 2011-05-13 18:41:04 -07:00 committed by Android Git Automerger
commit ade8cd9080

Diff Content Not Available