OSDN Git Service

Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0
authorTom Cherry <tomcherry@google.com>
Fri, 14 Jul 2017 23:18:08 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 23:18:08 +0000 (23:18 +0000)
commitdd57ee86325e13338d1be5f2d34b3b0a9f7c6d26
tree462242099ced77d37cb18d8f92a024c942b89751
parent9522550f2907fa2dce6f872c83de73a75c03ebd4
parent6af1b87cbcfb85d2845212947916da776d97b608
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0
am: 6af1b87cbc

Change-Id: I4eaa7306a01fc156ee133f379c609d95a96bb3a3