| commit | 73e9a4aa9d5ea36ca8447080a2bb4860f332b1a9 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri May 13 18:43:14 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 13 18:43:14 2011 -0700 |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 | |
| parent | ac6a322e2483e3b85200f3cd2fa8223c457373eb [diff] | |
| parent | ade8cd908069fc8310ed07bb0858de39b5766fa7 [diff] |
am 24df0757: (-s ours) am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. * commit '24df0757f86851569b65dadd0dfa139521748b9c': DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.