tree e8cffb1885f8a5dff1083c4e508e1d541dc2e4ad
parent 31ee0e6a6aa2e5f872a3af69f2a80af44fe69539
parent 31361232e1e7965d00c638ead2903f08f168f1c9
author Martijn Coenen <maco@google.com> 1491277306 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491277308 +0000

Merge "vndservicemanager: load vendor service_contexts." into oc-dev