tree fe500695e7001a040b25592e8499e616f00ecd3a
parent 65d59e2be2cfd713513a05d80a0f75794ab60579
parent f2d082c5863fc2a660a165f68dc4ddc73cdd0463
author Dan Willemsen <dwillemsen@google.com> 1522899515 -0700
committer android-build-merger <android-build-merger@google.com> 1522899515 -0700

Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 152ea797fd
am: f2d082c586

Change-Id: I64a51c2aab7e05cfdf9aaa22c17f64ab0632f783