OSDN Git Service

Merge "Add timeout to StrictMode flash." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 00:36:09 +0000 (00:36 +0000)
commitb1a2cde4fdb6bac0281b8a0683ccfeba3d917325
tree625c067beb9406e8aeebae4f3a395146f7c39edc
parent736cb0e33a343f7d8a599e603780489191a421f6
parentfdb3d31504bdaaad923d4add22cec9ba1ed5585f
Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504

Change-Id: I13684a6c952e978eed035e8c217605469c3b8665