tree c30bc3ba311dadc3e421be5324d9951bdda5b7ce
parent 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc
parent b2b020922fb51b88d34a6478209fc232702de318
author Dianne Hackborn <hackbod@google.com> 1439252384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439252384 +0000

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

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