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

Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 47302a0e22 am: f223f6e91c
am: e7cbff5118

Change-Id: I558f3f117d1598c56bf392d1e57c64a3a89c9c22