am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"

* commit '27badee3f567015183ab584fae1cbd32a996e78d':
  stubs
This commit is contained in:
Jean-Baptiste Queru
2011-01-31 14:00:52 -08:00
committed by Android Git Automerger

Diff Content Not Available