tree 37a629af97c079e724226859886b20a700e9e934
parent 35c419caafc504a944aaef34c30ef901186cfcda
parent b0b4bcfc3148693f26736ca191171380577d04ce
author Adam Powell <adamp@google.com> 1308210562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308210562 -0700

am b0b4bcfc: DO NOT MERGE.  Only impacts SDK.  Integrate from master.

* commit 'b0b4bcfc3148693f26736ca191171380577d04ce':
  DO NOT MERGE.  Only impacts SDK.  Integrate from master.