OSDN Git Service

Merge "Add support for disabling the greylist." am: 2d389ffee9
authorElliott Hughes <enh@google.com>
Thu, 6 Apr 2017 20:49:04 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 20:49:04 +0000 (20:49 +0000)
commit3e9be8b16671ed83c366c98895ec3419e81cea79
tree0042c5148071c78240b2915f3f053ac82406402c
parent38c7199683d4488ca1c5e64ad97c70422f324dd7
parent24ee61a61074d19cd38fe3c1bd3a24e8cc5f6ee9
Merge "Add support for disabling the greylist." am: 2d389ffee9
am: 24ee61a610

Change-Id: I627cb0043c0bc02c8bfc19118afbc3620adc51e3