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)
commit7e5fd51c9bd3739b9b41b472f5fa32df909b31b4
treeea966d186b0ffc7cdbdc1e845d1ae50a87c5e48e
parent730a1168e6ac094faab74b513f180e43759a8d49
parent7a4cf16ce9f6055a26e56008c870a874253bd550
Merge "Fix companion uses-permission enforcement" into oc-dev
am: 7a4cf16ce9

Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8