commit | ade8cd908069fc8310ed07bb0858de39b5766fa7 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri May 13 18:41:04 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 13 18:41:04 2011 -0700 |
tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 | |
parent | b35013083fd1bcf49d355524e1ea8ca66695b763 [diff] | |
parent | 923d3e4e36fb7fbbffe0e857eb696ee32342ea48 [diff] |
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.