commit | cacd78fef95adf497201c4a96bdde767653c7891 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat Jun 06 01:41:30 2020 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jun 06 01:41:30 2020 +0000 |
tree | f286cd1e99f079be5010b380ae90001cc1a56f72 | |
parent | fbf126a6f8a001b03d98b93467259fc6cd9b5b57 [diff] | |
parent | fce5f45653dd5b4299a04521c1a63e51b4f7cc07 [diff] |
Merge changes from topic "QQ3A.200605.002_merge" * changes: Convert Android.mk to Android.bp for CVE-2018-9536 Merge QQ3A.200605.002 into master