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)
commit3966bd8ff731d149bf54b668f4bc1dacd7e453c0
tree4ae2e19f08ea08ac963003babcd444bc8ed6de3f
parent04989ae2bbf1c91679c243ff1743ae30ddbc83bb
parente6d4e7ddb4ec639d7bfdf9f1e6196874af8ad32f
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4dfdceb" into oc-dr1-dev-plus-aosp
am: e6d4e7ddb4

Change-Id: I71526da73c0dcb36ec76be4672d554bf4ff23247