tree fc771ed690bb36cf7b9be6d2a733c8b2720180a8
parent 604a4b71711adb5a04aab6c10b51f2415d0317f7
parent bbe18f9c615e0953a5e6662f2237c97acfe369b4
author TreeHugger Robot <treehugger-gerrit@google.com> 1501368988 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501368988 +0000

Merge "Fix issue where clock inflation would fail" into oc-dr1-dev