tree f878a7549cc1f592446549144c0172597223ccdd
parent 23343e4b12670dbc0e3b7587ef7179589bc1b1a5
author Adam Langley <agl@google.com> 1422923427 -0800
committer Adam Langley <agl@google.com> 1422923427 -0800

Fix patch collision of d062c8af and 2b2d66d4.

These two patches conflicted but, because it wasn't a textual conflict,
Gerrit didn't notice.

Change-Id: I53464127e5e71dfa2f6c8a8847b41968671c2047