diff options
| author | Bo Hu <bohu@google.com> | 2017-05-18 14:12:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-18 14:12:45 +0000 |
| commit | ffa27cbd84a674b3f7698aa3a409aca89a3be8fd (patch) | |
| tree | 777ea94dcf31d2ce06099b970efee1b02a610a82 | |
| parent | 81acb101e906d2e3af582880fa91e4781bbc90d3 (diff) | |
| parent | 3b91774c2a3ecaf61903dbb652fc57f8aab44450 (diff) | |
| download | atv-ffa27cbd84a674b3f7698aa3a409aca89a3be8fd.tar.gz | |
Merge "atv-sdk: use google as brand instead of generic_x86" into oc-dev
am: 3b91774c2a
Change-Id: I01a1f7be9d6b912ad55c80b1371e8b342eb77598
| -rw-r--r-- | products/sdk_atv_armv7.mk | 2 | ||||
| -rw-r--r-- | products/sdk_atv_x86.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk index 45b3d65..2243f4e 100644 --- a/products/sdk_atv_armv7.mk +++ b/products/sdk_atv_armv7.mk @@ -70,4 +70,4 @@ $(call inherit-product, device/google/atv/products/atv_base.mk) # Overrides PRODUCT_NAME := sdk_atv_armv7 PRODUCT_DEVICE := generic -PRODUCT_BRAND := generic +PRODUCT_BRAND := google diff --git a/products/sdk_atv_x86.mk b/products/sdk_atv_x86.mk index aa4fb7e..1b6f3f7 100644 --- a/products/sdk_atv_x86.mk +++ b/products/sdk_atv_x86.mk @@ -20,4 +20,4 @@ $(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk) # Overrides PRODUCT_NAME := sdk_atv_x86 PRODUCT_DEVICE := generic_x86 -PRODUCT_BRAND := generic_x86 +PRODUCT_BRAND := google |