From: Tao Bao <tbao@google.com>
Date: Fri, 30 Sep 2016 23:16:42 +0000 (+0000)
Subject: Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~1026
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d5021c2e1cd6a5bcde052311d8e6f57714acfbc;p=android-x86%2Fframeworks-base.git

Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
am: 473b048cf7

Change-Id: Ica2b14c6372e12873290d3c3fc244bb0f03c305d
---

9d5021c2e1cd6a5bcde052311d8e6f57714acfbc