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)
commit6af1b87cbcfb85d2845212947916da776d97b608
tree5b696dbf9b6ca42d836a570c86bc8c57df1d2d4f
parent1965c510e4f829f6cb0550c631d195c86da2d514
parent4e02dcd7d0e3851b68440b394b923a7b0e9c7ebd
Merge changes from topic 'ext4_encryption_flag' am: 7ce805c97e
am: 4e02dcd7d0

Change-Id: I562edcdf7fb0c8b84edfaf400702ce17d528c817