tree a041c6d79e80b68d301c2a72d4bffe9a309d95ee
parent 16d14886148266ccf0655566715beb72a4c4ef31
parent add19af4f7f2a31486794c8c2c1719c6200474e0
author James Hawkins <jhawkins@google.com> 1507326512 +0000
committer android-build-merger <android-build-merger@google.com> 1507326512 +0000

Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e
am: add19af4f7

Change-Id: I039a405369d50a69945ed2ad9c09a714b4bd01b0