OSDN Git Service

Merge "Prefer property_contexts from /system & /vendor" am: b3b11edda1 am: 5dd51fa6bf
authorAlex Klyubin <klyubin@google.com>
Thu, 9 Mar 2017 19:34:17 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Mar 2017 19:34:17 +0000 (19:34 +0000)
am: 41c17bdb42

Change-Id: Idfb0b531c544efd7b62de9108c422d9a7cb3b84f


Trivial merge