| commit | d5a1e03b98d98e00dbc93fd5500a52b6c61006bd | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Tue Jun 20 21:27:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 21:27:10 2017 +0000 |
| tree | 37fe1a2248c82d1ab5f9eb277f0b9935dd242d35 | |
| parent | 151fcbbf7fdb11914e1b262edc9131e5c4795340 [diff] | |
| parent | f93ee900ed7ade0ea15f9949353944ff46b5a485 [diff] |
Merge "Merge "Merge "[DO NOT MERGE] Remove SecurityTest annotation" into marshmallow-cts-dev am: 2de9aa7273 -s ours" into nougat-cts-dev am: ccac6e7814 -s ours" into nougat-mr1-cts-dev am: f93ee900ed -s ours Change-Id: I1854e93b41ececeb316628074dae7d9f27258838