commit | 1abb2db10c93266a415d76b859bff133ac95d52d | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Thu Jun 16 00:54:35 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 00:54:35 2011 -0700 |
tree | 7691f5a562532d3dcc01b13850584784680baa69 | |
parent | 344560c9d99c403027592f80d86d879fcedcc9e2 [diff] | |
parent | 1de571fdd3e56aa1912458f610882ee0f9cf138b [diff] |
am 1de571fd: am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master. * commit '1de571fdd3e56aa1912458f610882ee0f9cf138b': DO NOT MERGE. Only impacts SDK. Integrate from master.