| commit | 4bba1449bf2504cd58f2b86ab9ab6289b63a36cf | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 20 22:40:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 22:40:19 2016 +0000 |
| tree | 41045abbe6c5a6ddb65849c35d4771470b28677f | |
| parent | 80153c253c144057dbe68e29ab098dabc17b6d95 [diff] | |
| parent | d607385b79980623e7990752c9be70e56aa7acb0 [diff] |
Merge \\"EncryptionTest: Run only for API level >= 23\\" into marshmallow-cts-dev am: b9ff9189d6 am: d607385b79 Change-Id: I273855e58475116c7758ad4739f5bdf724c3787c