OSDN Git Service

Merge "Log the error when uncrypt timeouts"
authorTianjie Xu <xunchang@google.com>
Wed, 28 Sep 2016 19:53:37 +0000 (19:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 19:53:37 +0000 (19:53 +0000)
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e


Trivial merge