OSDN Git Service

Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev am: e422b0b29f am: 170e5...
authorTianjie Xu <xunchang@google.com>
Thu, 29 Sep 2016 18:43:52 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 18:43:52 +0000 (18:43 +0000)
commitc6dbd5d27fd3395dde8eb2426da9ff7dbd23ee14
treee60bb5dca4b5ea1943b785f5f7170dca6c35bd72
parentfcce46d7d2a21071933b7b10eb32975459b3709d
parent9c5c01e261fe0e41971fccd501d850ac564a2c00
Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev am: e422b0b29f am: 170e5f5e48
am: 9c5c01e261

Change-Id: I0c8a2bb38171b0c717563a20bf9f480c4945d8f6