tree 7678104d4beea70827851f60bb2a86637551fcda
parent 942358fd018b5ba8d0e91882a245e28872b88cb7
parent d0a7ee1cfcc200387ad563f5cb734fb224f49296
author Andrew Sapperstein <asapperstein@google.com> 1565301926 -0700
committer android-build-merger <android-build-merger@google.com> 1565301926 -0700

[automerger skipped] Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9 am: 386126a450 am: c8230fa7b5
am: d0a7ee1cfc -s ours
am skip reason: change_id I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac with SHA1 1a3158b8e1 is in history

Change-Id: I2b79fc52f8c358920172f2847414e41bd4aaf505