tree e0a6184e3e26d5f8c8247ea6b69a559e4f1fbe47
parent 090109cb198fa8b0a34b312c3870c8f399989ff9
parent 897f88340969e7ad06cb978ff5e50bc4eecd23c9
author Eugene Susla <eugenesusla@google.com> 1493681541 +0000
committer android-build-merger <android-build-merger@google.com> 1493681541 +0000

Merge "Change protection level of companion permissions" into oc-dev
am: 897f883409

Change-Id: I5b123b603debc11a6ef0ed12a5f6da5d0c3ee533