| commit | 5bf7ec039ab7cc3fa86857ba01b609a54cfd0148 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 06 17:11:44 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 06 17:11:44 2019 +0000 |
| tree | f6100ec490bfed0ac2ea9190cd691a24ef6bca82 | |
| parent | c417eac346f9366f9f3a41007ac629893960926e [diff] | |
| parent | 151fa4cabea8cd5a01a993252d0d284c6ec446d3 [diff] |
Merge changes from topics "am-80b4dac5-dec4-435e-80da-9e61e57797f9", "am-d330d473-ae1e-4326-aebb-577000cc3d45" into nyc-mr2-dev * changes: [RESTRICT AUTOMERGE]: CTS test fix for Android Security CVE-2017-0630 Revert "[RESTRICT AUTOMERGE]Revert "RESTRICT AUTOMERGE : CTS test for Android Security b/72460579 b/34277115""