am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"

* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs
This commit is contained in:
Jean-Baptiste Queru 2011-02-11 10:16:45 -08:00 committed by Android Git Automerger
commit 6f436ed2b9

Diff Content Not Available