OSDN Git Service

resolve merge conflicts of 4ad7784 to stage-aosp-master
authorPaul Crowley <paulcrowley@google.com>
Tue, 27 Jun 2017 16:33:39 +0000 (09:33 -0700)
committerPaul Crowley <paulcrowley@google.com>
Wed, 28 Jun 2017 21:52:46 +0000 (21:52 +0000)
commitddb542f5745d37a8d5b72732f67a4e60b895254b
tree5bfe06bb56a6f4ae5647ee64032b28df47addb0d
parentdfd04923541de579e99ac8dacc678abb3a3e3f33
parent4ad7784b07c476800dcbad1e9a749e02812b2d9e
resolve merge conflicts of 4ad7784 to stage-aosp-master

Test: Build seems to be unrelatedly broken
Change-Id: I2df307aa1c7134f217c558495e1438412480f324
Merged-In: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
Ext4Crypt.cpp