commit | 9eaeba9040049dcfa9cc54fdb81ced6f3130a9c5 | [log] [tgz] |
---|---|---|
author | James Hawkins <jhawkins@google.com> | Thu Feb 09 02:47:08 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 09 02:47:08 2017 +0000 |
tree | b6cdea05ca5b09f2bcbba8bb22b81bd5098f3fb7 | |
parent | bebf78491b9e8644f49df0bdc0f9a41230c25fe3 [diff] | |
parent | 0a2efefbe964a2e1e6bc48afeffaec899104dd8b [diff] |
Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" am: 23f4e6b0a5 am: cefdacef3c am: 39ce80f0e0 am: 0a2efefbe9 Change-Id: I9fcfe3120f15b50efdb25a5d6487b9ea33a0bc30