OSDN Git Service

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

Change-Id: I2afc36ae954b172961f9646cadcd772b96918128