OSDN Git Service

resolve merge conflicts of 2b6f9ce823 to master.
authorJeff Vander Stoep <jeffv@google.com>
Mon, 1 Feb 2016 23:24:58 +0000 (15:24 -0800)
committerJeff Vander Stoep <jeffv@google.com>
Mon, 1 Feb 2016 23:24:58 +0000 (15:24 -0800)
commit75fc83bac8ad3aba3bbb65092974ab3a16822210
tree2959d902d64b6557cbd8c25b67553a7ff6e25342
parentb92f83c0512bfb93e85d6cd8d6efd6681017664c
parent2b6f9ce823adf9be2045452f4337a22500567ffc
resolve merge conflicts of 2b6f9ce823 to master.

Change-Id: I69f36f560334b11b099f2eb15999603dd2469d4f
Android.mk
cryptfs.c