tree fce61079894aa5c698e2e5401d2d934196f17044
parent 5fcaf8e9c440b4f24efdd1e8603103f66deaeb3a
parent 7e5fd51c9bd3739b9b41b472f5fa32df909b31b4
author Eugene Susla <eugenesusla@google.com> 1497564021 +0000
committer android-build-merger <android-build-merger@google.com> 1497564021 +0000

Merge "Fix companion uses-permission enforcement" into oc-dev am: 7a4cf16ce9
am: 7e5fd51c9b

Change-Id: I909e4238fe74940a6a1e3a4e9a1a8f7f3dc45dd6