| commit | eb06280c29e02dbdc761b75eebdfb79dde825450 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu May 12 17:31:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 12 17:31:25 2011 -0700 |
| tree | 7bf57adeda6dc0496cc01599d824b79abafe52a9 | |
| parent | ff10dada8395bc0b4da6b858e7463b02492bd80a [diff] | |
| parent | fd7d4cf691541cb7005e21b7872f168f5e861f1a [diff] |
am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge * commit '55fa681ac774240509def9d75ad7e16ea5515dd1': DO NOT MERGE Define Protocol class