am bb09485b: Merge commit \'09564fbb\' into manualmerge

* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class
This commit is contained in:
Irfan Sheriff 2011-05-12 16:02:43 -07:00 committed by Android Git Automerger
commit fd7d4cf691

Diff Content Not Available