| commit | 48c0dc6c4b1a80ea134164a9acd791593f55aed6 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Sat Apr 29 17:04:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 29 17:04:46 2017 +0000 |
| tree | f425836aaeddd802516a4d018b236571ab285739 | |
| parent | 408ec0b463a14bb1cb583b29d72c097a7ba0979d [diff] | |
| parent | 066422180bd8a93739ae89dd9eaaa4a021d976b7 [diff] |
Merge "Rename Companion permissions" into oc-dev