OSDN Git Service

Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
authorTao Bao <tbao@google.com>
Fri, 30 Sep 2016 23:16:42 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 23:16:42 +0000 (23:16 +0000)
am: 473b048cf7

Change-Id: Ica2b14c6372e12873290d3c3fc244bb0f03c305d


Trivial merge