tree ed51761d00b25a62b372f11eee00ce18cb3535dc
parent c7b36eb77beed889fc8b0e5f068b9b04bfd3a40b
parent e13b57b3b98b1ba0df28636866f025a22f5a3e49
author Shubang <shubang@google.com> 1507339348 +0000
committer android-build-merger <android-build-merger@google.com> 1507339348 +0000

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

Change-Id: I91925da75262c8980d27e3e33f5822aa0b4495b4