commit | 22f8156c776bdb8454c7ba34d82cf7d0d71fdfe9 | [log] [tgz] |
---|---|---|
author | Krishna C R <krishna.cr@ittiam.com> | Mon Jun 11 18:42:43 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 11 18:42:43 2018 -0700 |
tree | 219096bf027b38d0681c17a7493eb0d34f36204e | |
parent | 23eb5f6376b4c3b05facbe56bfc21b8743332a7b [diff] | |
parent | 4e2287eca52d38a78beb77fa4ddcecf5d6fde005 [diff] |
Merge "[automerger skipped] Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into marshmallow-cts-dev am: 9acef519d9 -s ours" into nougat-cts-dev am: 4e2287eca5 -s ours Change-Id: I69eebecb43b602c8476e09578109708c858f4124