tree 7678104d4beea70827851f60bb2a86637551fcda
parent 9ab41f56130d3682f8a9921b8115b881fcc5228c
parent 5f85c1fe745cd224f49f71d3db6d5118072f25c4
author Andrew Sapperstein <asapperstein@google.com> 1565302355 -0700
committer android-build-merger <android-build-merger@google.com> 1565302355 -0700

[automerger skipped] Merge "Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9 am: 386126a450 am: f9dc7e8535" into qt-qpr1-dev-plus-aosp
am: 5f85c1fe74 -s ours
am skip reason: change_id I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac with SHA1 e016781807 is in history

Change-Id: I2b912a3cab74e5ea224290c48a64ed8b11b56545