| commit | e167bc6c26e0c4771bda0d3cd956d80746624218 | [log] [tgz] |
|---|---|---|
| author | Raj Mamadgi <rmamadgi@sta.samsung.com> | Wed May 03 01:22:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 03 01:22:01 2017 +0000 |
| tree | 9becd9eeaa07eb876dc881ffdea1050e0a203b09 | |
| parent | f4668e21e202e36e70197e439b2e89b9e841f8fb [diff] | |
| parent | 603c17858d7b6333de7e3d385a5aafa0b933e2d6 [diff] |
Merge "Merge "Adding support for File based encyrption to CTS Verfier" into nougat-cts-dev am: 258850c47e" into nougat-mr1-cts-dev am: 603c17858d Change-Id: I7211e6b09a4da28091345c2bdc114cffb5dabe9f