| commit | d52f0e629dec89e0e70f5cfe6ce04f7bb9481414 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Thu Jun 16 12:42:46 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 12:42:46 2011 -0700 |
| tree | 5bbc67e5d0e95b72d07017041abaf62e860a456a | |
| parent | 7f57c82587eec380d341b3059a9bac210819dde3 [diff] | |
| parent | 1abb2db10c93266a415d76b859bff133ac95d52d [diff] |
am 1abb2db1: (-s ours) am 1de571fd: am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master. * commit '1abb2db10c93266a415d76b859bff133ac95d52d': DO NOT MERGE. Only impacts SDK. Integrate from master.