tree 7bf57adeda6dc0496cc01599d824b79abafe52a9
parent ff10dada8395bc0b4da6b858e7463b02492bd80a
parent fd7d4cf691541cb7005e21b7872f168f5e861f1a
author Irfan Sheriff <isheriff@google.com> 1305246685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305246685 -0700

am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge

* commit '55fa681ac774240509def9d75ad7e16ea5515dd1':
  DO NOT MERGE Define Protocol class