tree d6d44fd67d9798bb8309ca62169a7a050d144e4b
parent e70b637f7c07e1916b5a0738a1745ce9a4eb3c47
parent 8f74ba97f8cb69567162c00b4ba264356e2d4602
author Mahesh Kumar <mahesh.kumar@mediatek.com> 1539835711 -0700
committer android-build-merger <android-build-merger@google.com> 1539835711 -0700

Merge "App Standby Settings key is set incorrectly" into pie-cts-dev
am: 8f74ba97f8

Change-Id: I4b397dc03e24a4ee553b6b42256daad309d9d8fd