tree 8c93387cf728f31a36b4a1ff192dd819c0028087
parent b62205d75073783e171fbcd5f675e25e57833479
parent 47302a0e22c620b9f7b9d2215bd32d54f68e7bb6
author Dan Willemsen <dwillemsen@google.com> 1522898858 -0700
committer android-build-merger <android-build-merger@google.com> 1522898858 -0700

Switch from add_lunch_combo to COMMON_LUNCH_CHOICES
am: 47302a0e22

Change-Id: I88e8f4ff0cb24cac3891c2243f24fb445aa0aa2c