| commit | d5e6bdf62fbf2892592eb170f5e9c9a5e31812ef | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:36:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:36:32 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | fc1c8675d3b1139c8d72a161808ca937fba51870 [diff] | |
| parent | 7e70b6c9f23eca3d464bb3defc358046eeb33bdd [diff] |
am 0c3cb52d: (-s ours) am f4bb11d2: am 913ef1ca: Merge "Fixed a documentation error in protocol.txt" * commit '0c3cb52dfc358cd6d6e01062e7cff50fb98e93d0':