OSDN Git Service

Merge "Set advanced battery usage items as non-selectable" into oc-dev
authorAntony Sargent <asargent@google.com>
Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)
commit92661526d44d0e3175eb26e767498ff3c5588dc8
tree0f621341d975611c780f16ff67dee496cda1b4f8
parent3aae1f336ecb0e1a5c7ff042d7a2df8179c4bea8
parentd77b699e607461a458bd75de3b3be2b5e12af33b
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am: d77b699e60

Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec