tree bf618ed7e21e60a9c53569d0ed747f2bec9b6c83
parent 85fa07b8312262eddbe795ca00ebd451dab7b8d3
parent 1da6af31ffb67e43a004ba2dddc4be0a0cb7edce
author Ahmed ElArabawy <arabawy@google.com> 1500502300 +0000
committer android-build-merger <android-build-merger@google.com> 1500502300 +0000

Merge "Add Configuration to APF Policy" into oc-dr1-dev
am: 1da6af31ff

Change-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492