tree fe1351ae4dbe12950125fe95e35b4470e607ced5
parent 20c2116c1f7f05b5a9628a22c4433701a89d0068
parent eebd276715783df06f0e4720ccc709b59e551c59
author TreeHugger Robot <treehugger-gerrit@google.com> 1497560236 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497560255 +0000

Merge "Fix companion uses-permission enforcement" into oc-dev