OSDN Git Service

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into...
authorTianjie Xu <xunchang@google.com>
Tue, 13 Jun 2017 01:25:33 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:25:33 +0000 (01:25 +0000)
am: 1fa1f100a3

Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9


Trivial merge