OSDN Git Service

Merge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
authorAhmed ElArabawy <arabawy@google.com>
Thu, 20 Jul 2017 04:01:11 +0000 (04:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 04:01:11 +0000 (04:01 +0000)
commit7e8c7b806e38fa26348fa28d3340b8ef32a3141c
treee22080ceadde21781b8e751ca1d6d08a9d8b1672
parent231610fc1a9e78cf07779882e31e082e786c701a
parent2d0f47c40fd657d83c4101760e3b9dca92cfdf8c
Merge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
am: 2d0f47c40f  -s ours

Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf