OSDN Git Service

Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value...
authorJames Hawkins <jhawkins@google.com>
Thu, 14 Sep 2017 01:11:43 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 01:11:43 +0000 (01:11 +0000)
am: 624f617d01

Change-Id: Ief37c97c762b72161684c0fe7be8c5e6dad42b2d


Trivial merge