| commit | 8a52bc12138c125febac76a993fb5fd459993440 | [log] [tgz] |
|---|---|---|
| author | James Hawkins <jhawkins@google.com> | Thu Feb 09 02:38:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 09 02:38:37 2017 +0000 |
| tree | 4a7920623388d325941bf6c7135496c6f31cc86e | |
| parent | 6a840a305be9d686fc5f872d1d683b07861532c4 [diff] | |
| parent | 796ca6bac2e5c006322c7342d9a73417a9bbfdb4 [diff] |
Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" am: 23f4e6b0a5 am: cefdacef3c am: 39ce80f0e0 Change-Id: I8a9e2336c40769966400a443ae0ebb99e1986742