tree 49776bf4a9f4e49a5c5459a52f9af11b3225ddb3
parent 31c0be94efa686aa54c2668c7dce2d09165e1dfe
parent 4dc293841802ab8ff15a66e1b6e6178fa126646a
author Shubang <shubang@google.com> 1507338782 +0000
committer android-build-merger <android-build-merger@google.com> 1507338782 +0000

Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev
am: 4dc2938418

Change-Id: Ic08fbf1610140c9c60d1c91b9960b62304e1d6be