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)
commitb0f3f6ce0509870ce40168ce4bd422942bc6b47f
tree4fc40676953651970e2e37c304ca4dd035d1658d
parent1197438540f83c26f402c63ffc4b1a54ea12eff0
parenta639e32289c94651df872f5cf6fafdfb9c93a8b9
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
am: a639e32289

Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501