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)
commitc68e6d6708879d5e6137a0c876b01e8260bd02d6
tree2951980bd300cbb594ba4467428355790042f5e7
parent9c0412b7ca1e3e1438e792bbe9a1f45cceb46b84
parentc1973ecbd2a87197d8b6b9f3996228f6ebd4e2a8
Merge "Log the error when uncrypt timeouts"
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e