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

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

Change-Id: I33425add74d8bceb461a30c488fd7f1179caa176