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:10 +0000 (15:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)
commit6a5f36a49459a8982f69551cab67128d5a82bade
treee35f70095f77c90d67e9cc486ebfa7d030b1b7a1
parent5d02b8b85fd62a2c51585f98c7ae02e24c013d02
parentd77b699e607461a458bd75de3b3be2b5e12af33b
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13