Yabin Cui 0c39203698 resolve merge conflicts of 61799ba to nyc-dev-plus-aosp ...

Change-Id: Ib1d0afe9022ec82f05be8b56201e73505160cacc

2016-03-29 16:47:18 -07:00

..

Android.mk

move uncrypt from init.rc to uncrypt.rc

2015-09-03 16:32:54 -07:00

uncrypt.cpp

resolve merge conflicts of 61799ba to nyc-dev-plus-aosp

2016-03-29 16:47:18 -07:00

uncrypt.rc

uncrypt: Communicate via /dev/socket/uncrypt.

2016-03-02 23:23:32 -08:00