tree 4323a6e1010db65488c18a7999d75af454c2217c
parent 7d06d7bd7931ddec00b63aa080bd30a3e4b4c15d
parent 011ac1bb7c9c16468a337233ca7e801ca1a82557
author Lucas Dupin <dupin@google.com> 1501369449 +0000
committer android-build-merger <android-build-merger@google.com> 1501369449 +0000

Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am: 011ac1bb7c

Change-Id: I2c1685e78a2de37192eceff40d254546b37d7d5e