OSDN Git Service

Merge "Doze settings example not matching real keys" am: 570a13f
authorAdam Lesinski <adamlesinski@google.com>
Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)
commit2988b8f641e9d9602cc6ebdd1fad388a57a5f6ec
treec507ee6da322eebe012b70f6b6ad5e38055c2415
parent40c611853eedd9d7ebf41a778e278751fbc82cb8
parent790699db64ee18d143cd9813e91044fcc5a26713
Merge "Doze settings example not matching real keys" am: 570a13f
am: 790699d

* commit '790699db64ee18d143cd9813e91044fcc5a26713':
  Doze settings example not matching real keys

Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f
core/java/android/provider/Settings.java