refs/heads/kitkat-mr2.1-release - platform/external/chromium_org/third_party/ots

commit: c49aaa128f71eb5ec85d2fe3b6fd561420cdc633
[log]
author: Torne (Richard Coles) <[email protected]>
Thu Jan 02 15:18:10 2014 +0000
committer: Torne (Richard Coles) <[email protected]>
Thu Jan 02 15:18:10 2014 +0000
tree: 281a72ffa4220b245cff74fe7bb62405c0ca7e49
parent: 1913920e580b369a188ef9b426aac94382064731 [diff]
parent: 12f7d4f959a91a7453dba03f5e8f024fbbfc27e9 [diff]

Merge from Chromium at DEPS revision 241107

This commit was generated by merge_to_master.py.

Change-Id: I58a7a00d35df388150ea74349517c0dcd18ea793