OSDN Git Service

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
authorTianjie Xu <xunchang@google.com>
Mon, 12 Jun 2017 23:55:23 +0000 (23:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 23:55:23 +0000 (23:55 +0000)
commitd04d501ce733f02a08951ca5d019773ea429074f
treee7c6d8733a59155ee30cc33c99995426b7189f00
parent2fa5800da94ba493d54d31ce1e71ae483bcb9a76
parentf40f29754662ab88040582f26351e4ed0e1381e7
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
services/java/com/android/server/SystemServer.java