OSDN Git Service

Merge "Fix companion uses-permission enforcement" into oc-dev
authorEugene Susla <eugenesusla@google.com>
Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)
am: 7a4cf16ce9

Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8


Trivial merge