commit | 377a782dee3c1dfc03fdd1d9e6780277b5b750f4 | [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 | 2ef8f6c0d929e672b37ca7fc94547c4d8fcf43d2 [diff] | |
parent | f8d8fbdeb9847755ed8eac62b4044eaeba8ed194 [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.