OSDN Git Service

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

Change-Id: I49be989c2946e10e8b8de7097bffd999045dbf62


Trivial merge