OSDN Git Service

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

Change-Id: I562edcdf7fb0c8b84edfaf400702ce17d528c817


Trivial merge