tree 127a1c11d718aa88b93ae7a6362c2b5d65d50374
parent 8e28ab22de4eb246114f32856ec8a46ae4a0e1cc
parent 6901f963c27f2d0a9caf56b42b6054d0cecc84d1
author Jean-Baptiste Queru <jbq@google.com> 1297447493 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297447493 -0800

am 6901f963: am 93552de8: Merge "stubs"

* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs