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

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

Change-Id: I26260647428a95e62c9afef5f3e6e14067e6a622