| commit | 510f9eb2426dd26090b7ec5d594c4913d1b2d3ed | [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 | c86bfd0b8703eeb6e6bafd98d76b2dd0e129b179 | |
| parent | 8c2f85d94145a96f53e9041c609e283be7412a0f [diff] | |
| parent | 24df0757f86851569b65dadd0dfa139521748b9c [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.