tree 9a0c64c68595d934d14b62ca27ec3d90a52a00c8
parent d5e2c05cfc15b0f55f073887d3d306a334f1b823
parent 7cb47bdd6c605e6439b644fb2a6397af605745c4
author Dan Willemsen <dwillemsen@google.com> 1522898901 -0700
committer android-build-merger <android-build-merger@google.com> 1522898901 -0700

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

Change-Id: If53493888448b8a9db95a60036f3fb5c5e05ee73