| commit | e1442a5df03c71d3f04f64304803f20376e83557 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Jul 14 23:18:02 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:18:02 2017 +0000 |
| tree | 56b4baf344202b836916d01ad5457de6028ec3e9 | |
| parent | 77bf7449b20a765a36795da37eb4bfe7e61b6ebd [diff] | |
| parent | d165de95da2ea86a8881fceba4de611ab8f1341e [diff] |
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2 am: 5a6226929e am: d165de95da Change-Id: I11ebc6c79bcd5cf6b8fd619b1a71582b7c788d41