OSDN Git Service

Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev
authorTianjie Xu <xunchang@google.com>
Thu, 29 Sep 2016 18:10:01 +0000 (18:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 18:10:01 +0000 (18:10 +0000)
am: e422b0b29f

Change-Id: I8f12be5048b6022a8f2422a9a5e8121ede9daa1c


Trivial merge