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)
am: 6af1b87cbc

Change-Id: I4eaa7306a01fc156ee133f379c609d95a96bb3a3


Trivial merge