OSDN Git Service

Merge "Sometimes there's no advanced settings" into oc-mr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 21 Sep 2017 11:36:50 +0000 (11:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 11:36:50 +0000 (11:36 +0000)
am: a639e32289

Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501


Trivial merge