tree 5106dec8198311fc865e151a6599310013a239bb
parent 83682890190c9a5b73e1742a58c1e017ac418ee2
parent 5cf89a011932f1af9361e7b713e33ff5c5af3e61
author Dianne Hackborn <hackbod@google.com> 1439252900 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439252900 +0000

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

* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog