tree 45bf88a104e29e757636df070429718525c4d902
parent 2e6b8aad2f40da7c219cbfec62f264e504a6d408
parent 00b3a04ddbe54c5428cd0c536e36e60cefbac34a
author Sam Lin <samlin@google.com> 1492149996 +0000
committer android-build-merger <android-build-merger@google.com> 1492149996 +0000

Merge "Add IntentTest whitelist DynamicConfig" into oc-dev
am: 00b3a04ddb

Change-Id: I5995ba0cf617850e04bbd773e0ca423928b26fa1