tree 12b4ba4b5c1c62465cd8983e0f0e95f89e9c5b5f
parent 77d394326f7fc17831ee7702cb8b750fe0b21443
parent 43c68cca08c4ee22d5cb1fc3f5b7533775b2c848
author Dan Willemsen <dwillemsen@google.com> 1522899500 -0700
committer android-build-merger <android-build-merger@google.com> 1522899500 -0700

Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 2ced84e28c
am: 43c68cca08

Change-Id: I6341a922766eb726d5bcca57bf380d840b4becf6