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

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

Change-Id: I93bfe6c774a5b1a583894c833292918b2b97cd53