tree cf8bdf87810169187f4913fd41fdc806b5213c3e
parent ae88437d292f253f2bdea16cbe381e0ae46b15ab
parent 09e77852d8c25854894358789807a73c3e79ddf0
author Dianne Hackborn <hackbod@google.com> 1439253318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439253318 +0000

am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev

* commit '09e77852d8c25854894358789807a73c3e79ddf0':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog