tree 2f69741ea5b0796f252de1b22ee21440886d88b8
parent 01a5eba810bfdf5b111a7546814e174c1d57b6e7
parent 93552de8e305027fb003401e347b9493c64c981f
author Jean-Baptiste Queru <jbq@google.com> 1297446899 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297446899 -0800

am 93552de8: Merge "stubs"

* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs