OSDN Git Service

Merge commit 'c3e4cc29' into manualmerge
authorPaul Lawrence <paullawrence@google.com>
Wed, 29 Apr 2015 16:47:44 +0000 (09:47 -0700)
committerPaul Lawrence <paullawrence@google.com>
Wed, 29 Apr 2015 16:47:44 +0000 (09:47 -0700)
commite225260184b999c54878b1e254f7fe774429fd12
tree607dc4fa09faf77de5b3d962441472f60fd64410
parent3005fd38ee1d1ba2b3b8eb2604e2bb3eedd206b1
parentc3e4cc29f8ba2770de29e510444c9636e2aca624
Merge commit 'c3e4cc29' into manualmerge

Change-Id: I1f6feaf743e0b9a62fe212af3cd9dd16abefeb00
Android.mk
CommandListener.cpp
cryptfs.c
cryptfs.h