tree 0a055f0ef5e7459ca7db3df6b861cae7f15d6a99
parent 258706fc0ddcf2c9be48967f4766ec90efb736a5
parent 078cbd03b2073b31530845bc0e48a1a166914ec8
author Dan Willemsen <dwillemsen@google.com> 1522898845 -0700
committer android-build-merger <android-build-merger@google.com> 1522898845 -0700

Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 078cbd03b2

Change-Id: Ie360f330b29fd716048f31793e6bd593fc826613