Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CyanogenMod/cm_platform_sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cm-14.1
Choose a base ref
...
head repository: TeamEOS/cm_platform_sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mm6.0
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 8 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2015

  1. Point to TeamEos vendor 

    Change-Id: Ic0be31d46e937484ceca4b136025318d640724c4
    @bigrushdog
    bigrushdog committed Nov 2, 2015
    Copy the full SHA
    2511763 View commit details

Commits on Nov 4, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 4, 2015
    Copy the full SHA
    a17a98b View commit details

Commits on Nov 5, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 5, 2015
    Copy the full SHA
    6f0c077 View commit details

Commits on Nov 6, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 6, 2015
    Copy the full SHA
    2ed6fa7 View commit details

Commits on Nov 7, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 7, 2015
    Copy the full SHA
    869a7e6 View commit details

Commits on Nov 10, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 10, 2015
    Copy the full SHA
    77d12af View commit details

Commits on Nov 12, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 12, 2015
    Copy the full SHA
    20e6c8a View commit details

Commits on Nov 15, 2015

  1. Merge remote-tracking branch 'cm/cm-13.0' into mm6.0

    @bigrushdog
    bigrushdog committed Nov 15, 2015
    Copy the full SHA
    e5bbe4a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 Android.mk
2 changes: 1 addition & 1 deletion Android.mk
View file
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@ LOCAL_SRC_FILES := $(cmplat_docs_src_files)
LOCAL_ADDITONAL_JAVA_DIR := $(intermediates.COMMON)/src

LOCAL_IS_HOST_MODULE := false
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := vendor/cm/build/tools/droiddoc/templates-cmsdk
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := vendor/eos/build/tools/droiddoc/templates-cmsdk
LOCAL_ADDITIONAL_DEPENDENCIES := \
services