Julia Reynolds b0f3f6ce05 Merge "Sometimes there's no advanced settings" into oc-mr1-dev ...

am: a639e32289

Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501

2017-09-21 11:36:50 +00:00

..

com/android/settings

Merge "Sometimes there's no advanced settings" into oc-mr1-dev

2017-09-21 11:36:50 +00:00