tree 98ede552384ff13069b2d27e298464b316102853
parent b7e2c502142c9ef12fc847813fc3fbe40ad68cf8
parent 011ac1bb7c9c16468a337233ca7e801ca1a82557
author Lucas Dupin <dupin@google.com> 1501369446 +0000
committer android-build-merger <android-build-merger@google.com> 1501369446 +0000

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

Change-Id: If6aa57364f74e94f9460ef4190a9996fbdae600f