Antony Sargent 6a5f36a494 Merge "Set advanced battery usage items as non-selectable" into oc-dev ...

am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13

2017-06-09 15:49:10 +00:00

..

android

Merge "Default setup wizard to use PIN"

2017-05-18 08:43:24 +00:00

com/android

Merge "Set advanced battery usage items as non-selectable" into oc-dev

2017-06-09 15:49:10 +00:00