tree 8f1072363938fbd3d4bd349edceacee78ad6b4ad
parent b59737103648781e0f56fa4724c3627b7cfb85aa
parent eca29cb50808260b70965398cb9a8d120b00377c
author Paul Lawrence <paullawrence@google.com> 1495760919 +0000
committer android-build-merger <android-build-merger@google.com> 1495760919 +0000

Merge "Expand whitelist"
am: eca29cb508

Change-Id: Ic673b3fcaca1bb311da4aa23b8c8f2e24598d4f6