| commit | 15b0b85c04d2c743ee5a59ba074b0cf0a4859d92 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 20 22:48:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 22:48:39 2016 +0000 |
| tree | 1b956005c594cc09ae85a48e5609da1cebb5c8b5 | |
| parent | 5b1410a252f493b8bd08fcfa4618e4892e7a53f6 [diff] | |
| parent | b613161a9dd5496f1e42b015bda1deb683ae31fb [diff] |
Merge \\\\"EncryptionTest: Run only for API level >= 23\\\\" into marshmallow-cts-dev am: b9ff9189d6 am: d607385b79 am: 4bba1449bf am: b613161a9d Change-Id: I2622e6718d17cf320ea68bf9918df4c734b2929e