OSDN Git Service

Merge "Doze settings example not matching real keys"
authorHenrik Baard <henrik.baard@sonymobile.com>
Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)
commit790699db64ee18d143cd9813e91044fcc5a26713
tree3de8341cdb5e6fc0a1bf88e6cd23bc7c7292b6e5
parent3c207ff5af7c4f0a9d9cafa6c6f5c947cfdb78ca
parent570a13f0cb233b4a216243025a9fed3df3c72849
Merge "Doze settings example not matching real keys"
am: 570a13f

* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
  Doze settings example not matching real keys

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f