tree fdbed5963b3e962461552a102d6e45ff1b1101ac
parent 29b86d10d519a1a1620f42b83a0766246e286409
parent 938501cf7634843460b03b6fe954e927166e1257
author Sudheer Shanka <sudheersai@google.com> 1462994026 +0000
committer android-build-merger <android-build-merger@google.com> 1462994026 +0000

Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
am: 938501cf76

* commit '938501cf7634843460b03b6fe954e927166e1257':
  Add policy transparency to app notification settings on lockscreen.

Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0