commit | 4ce56af101043d29c300ba94eb74b37e825e9fd8 | [log] [tgz] |
---|---|---|
author | Luis Hector Chavez <lhchavez@google.com> | Thu Apr 19 10:59:22 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 19 10:59:22 2018 -0700 |
tree | 3f868b2533b6a82c889d0978853b6759f9a01f31 | |
parent | 51fbe3b1400beb1445677d4f3eea361a90310249 [diff] | |
parent | c12004dd23a01565457be603b71507cab91105e1 [diff] |
Merge "init: Use android::base::boot_clock instead of /proc/uptime" am: 8e73e6f242 am: c12004dd23 Change-Id: I3a5a13cefa2baadfb50771664727712f9dd5b803