tree 8d1b39496af896eacb1d90c3c9ccc890d05fcd66
parent 85333329dfcedba8cfdda6dca0886ef5efeaa51f
parent aca40d340de99513f4319727835cdabdd6ace69c
author Tom Cherry <tomcherry@google.com> 1499711305 +0000
committer android-build-merger <android-build-merger@google.com> 1499711305 +0000

Merge "Move Timer from init to libbase"
am: 896297b2ef

Change-Id: I1990fa013fa1fe69a61711faf032db45216f6f47