OSDN Git Service

Merge "Log the error when uncrypt timeouts" am: c1973ecbd2
authorTianjie Xu <xunchang@google.com>
Wed, 28 Sep 2016 19:59:12 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 19:59:12 +0000 (19:59 +0000)
commit3aeade44a9175ebea3170aced45db15d0d448b14
tree4ef235650a1d1f61e029b0458165cf01793e0c0f
parent6b32f3801ffc26d03e1bc3765b94512dc58d6c2e
parentc68e6d6708879d5e6137a0c876b01e8260bd02d6
Merge "Log the error when uncrypt timeouts" am: c1973ecbd2
am: c68e6d6708

Change-Id: I23ee644fb2f73fc3cece4faf59eb63417cfe3ea6