commit | 1de571fdd3e56aa1912458f610882ee0f9cf138b | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Thu Jun 16 00:49:22 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 16 00:49:22 2011 -0700 |
tree | 37a629af97c079e724226859886b20a700e9e934 | |
parent | 35c419caafc504a944aaef34c30ef901186cfcda [diff] | |
parent | b0b4bcfc3148693f26736ca191171380577d04ce [diff] |
am b0b4bcfc: DO NOT MERGE. Only impacts SDK. Integrate from master. * commit 'b0b4bcfc3148693f26736ca191171380577d04ce': DO NOT MERGE. Only impacts SDK. Integrate from master.