tree 65d532bfa58ed6b76cf1645baf6fbce49da8a651
parent 4ec10c8890e1a386397f4bac58ece06775ac1098
parent 9ef490aa428c648436f33a20f8d8b887a65048ec
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1555977235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1555977235 +0000

Merge "[automerger skipped] Merge "Fixed content capture whitelist for specific activities." into qt-dev am: 845d5ee587 am: 2d137edf28 -s ours am skip reason: change_id I2c76a01bd98c4154c4c59099f1368232d2dba80d with SHA1 41e9eb0aed is in history"