OSDN Git Service

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: b1a2cd...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 8 Jun 2017 05:49:10 +0000 (05:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jun 2017 05:49:19 +0000 (05:49 +0000)

Trivial merge