OSDN Git Service

Merge changes from topic 'ext4_encryption_flag'
authorTom Cherry <tomcherry@google.com>
Fri, 14 Jul 2017 23:12:05 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 23:12:05 +0000 (23:12 +0000)
am: 7ce805c97e

Change-Id: I11917818efdc536b35832116b4bafc7ecbaa29c7


Trivial merge