commit | c7e38c8527576ca89e9e8c02559431a15516ad43 | [log] [tgz] |
---|---|---|
author | James Hawkins <jhawkins@google.com> | Wed Mar 23 18:43:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 23 18:43:05 2016 +0000 |
tree | a084002812ff1a02c52f3ca2cacd192016ba63bd | |
parent | c9fdbdc6e2ed47633cca298bcb4714dba17f8398 [diff] | |
parent | 412fa2c27131858e35b8fdcc6e28cc84333a193e [diff] |
resolve merge conflicts of e8e8cf3 to nyc-dev-plus-aosp am: 412fa2c * commit '412fa2c27131858e35b8fdcc6e28cc84333a193e': bootstat: Track record inconsistencies w/ a debug metric, bootstat_mtime_matches_content.