| commit | 1f93faa9dfb687ec3b59eda5a0c257d0e47149cb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:19:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:19:37 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 8b7fa0419759c4681951eebb249b546b1ea26abe [diff] | |
| parent | d5e6bdf62fbf2892592eb170f5e9c9a5e31812ef [diff] |
am 15b8b8ad: am 0c3cb52d: (-s ours) am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt" * commit '15b8b8ad80123dec2995012e6282fb935000d666':