tree 8682826f643871d57212531730e56581f6fb1268
parent 2a96f5c0208cc23cf916f92fffe3205cd909ce75
parent 75875b647af85e9f923ec57e6d0b54a1c930dfd6
author Dan Willemsen <dwillemsen@google.com> 1522899555 -0700
committer android-build-merger <android-build-merger@google.com> 1522899555 -0700

Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 7cb47bdd6c
am: 75875b647a

Change-Id: I2925b68b57d8c8fdcf0d831ea9b1c0989667bad7