commit | f5f2e0d1b8e45b24d2e266ebdc8ec04d11ee3712 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Tue Feb 14 16:45:30 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 16:45:30 2017 +0000 |
tree | 31c41e301b886a5d7daf9fb7dbc611e479a2ad8a | |
parent | 69209514ce0903be52867c2e309e596fc7a35ad3 [diff] | |
parent | d774f90e1e8458678cb9cec258f4cca9c8c09b69 [diff] |
Merge "Merge "Remove trust agents test if platform has none." into marshmallow-cts-dev am: ed0766b6ad" into nougat-cts-dev am: d774f90e1e Change-Id: I6dbd8fb7cc44ae8b5161cacc7c581a0c2952c9be