OSDN Git Service

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4df...
authorJeff Sharkey <jsharkey@google.com>
Thu, 8 Jun 2017 06:15:50 +0000 (06:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 06:15:50 +0000 (06:15 +0000)
am: e6d4e7ddb4

Change-Id: I71526da73c0dcb36ec76be4672d554bf4ff23247


Trivial merge