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)
am: 2d0f47c40f  -s ours

Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf


Trivial merge