OSDN Git Service

Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0 am...
authorTom Cherry <tomcherry@google.com>
Fri, 14 Jul 2017 23:22:45 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 23:22:45 +0000 (23:22 +0000)
commitb7de93396e32eef38ebb1f42bcae6c49e2b6a690
treef65a1d29704e602eff565e24598387dcb3e8bffa
parenta3ba1412724f82bd00bb9ab7c8a22546b735714b
parentdd57ee86325e13338d1be5f2d34b3b0a9f7c6d26
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e am: 4e02dcd7d0 am: 6af1b87cbc
am: dd57ee8632

Change-Id: I27486ce41355cfa387d29ebb3f8a1f531d8101fd