OSDN Git Service

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
authorXin Li <delphij@google.com>
Thu, 27 Aug 2020 17:17:42 +0000 (10:17 -0700)
committerXin Li <delphij@google.com>
Thu, 27 Aug 2020 17:17:42 +0000 (10:17 -0700)
Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695

1  2 
FsCrypt.cpp

diff --cc FsCrypt.cpp
Simple merge