tree a4eba63603592b3797d14a1df14570c9b2d913f5
parent 25278b0197094f938f8b9cecf88f35e998a689da
parent dc747bd82e6bbc28e7991341d3e6f23121989830
author Adrian Roos <roosa@google.com> 1496968716 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496968722 +0000

Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev