OSDN Git Service

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

Change-Id: Ibbc203c98f5456de744374636bbc06f6dda87d3c


Trivial merge