tree 171216d6037ffc5e2ad8c5ca332ae1f3e3e1b468
parent ee70279f6cc8651f469b9aa36d6db8ff8fe8598b
parent 98897009f3ea8a5fa3e20a4a74977da7aaa8e61a
author Android Chromium Automerger <chromium-automerger@android> 1404213869 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1404213869 +0000

Merge third_party/ots from https://chromium.googlesource.com/external/ots.git at 98897009f3ea8a5fa3e20a4a74977da7aaa8e61a

This commit was generated by merge_from_chromium.py.

Change-Id: Ib41229bd8fa71b7a56338c5b04902753525aeac5