tree 299c7c9ab50c2a1fd598099c0431b00719b4de47
parent f7176dfbd284f7da49e5bccc2aa886b42039ba4a
parent a6fb375cf727b6ded057110875fe49a9b3f230a3
author Jean-Baptiste Queru <jbq@google.com> 1296504239 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296504239 -0800

am a6fb375c: am 056340ac: Merge "stubs"

* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs