tree c52be727d3596e2d9292a6998339bf45e07d2df2
parent 6d0a5ca3df5ac01d36b0e226039337869b3f9b60
parent 28446c917f33d93532dc9658a17b5c193c639b88
author David Brazdil <dbrazdil@google.com> 1535417048 -0700
committer android-build-merger <android-build-merger@google.com> 1535417048 -0700

Merge "Support whitelist entries from class2greylist" am: ac0ddfd9c5
am: 28446c917f

Change-Id: Ie88f36693b5ed6ee3931b45222d9fcf5bc5dd798