OSDN Git Service

Merge "Stop using trigger_reset_main." into qt-dev
authorMartijn Coenen <maco@google.com>
Wed, 1 May 2019 19:42:48 +0000 (12:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 May 2019 19:42:48 +0000 (12:42 -0700)
am: 9db42907b5

Change-Id: Ife6711c5e0ad5180ce805c8e1df02487c2a957be

1  2 
cryptfs.cpp

diff --cc cryptfs.cpp
Simple merge