tree 92e038f2913d3d7db03e2dbcde4997784b12ef14
parent 20e2394f754e9662ca7fe9ca6dd85d7c6c08103a
parent 7a4cf16ce9f6055a26e56008c870a874253bd550
author Eugene Susla <eugenesusla@google.com> 1497563077 +0000
committer android-build-merger <android-build-merger@google.com> 1497563077 +0000

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

Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1