Commit e3999a0b authored by Simon Wörner's avatar Simon Wörner

Merge branch 'cm-12.1' of github.com:CyanogenMod/android into brn-12.1

Change-Id: I37ac8b455bdd0f4092ce0c573fb3fd203f4e84a0
parents b9fe1cd7 45a80775
......@@ -4,7 +4,7 @@
<remote name="aosp"
fetch="https://android.googlesource.com"
review="android-review.googlesource.com"
revision="refs/tags/android-5.1.1_r13" />
revision="refs/tags/android-5.1.1_r18" />
<remote name="github"
fetch=".."
......@@ -385,6 +385,7 @@
<project path="hardware/broadcom/libbt" name="CyanogenMod/android_hardware_broadcom_libbt" groups="pdk" revision="refs/heads/cm-12.1" />
<project path="hardware/broadcom/wlan" name="CyanogenMod/android_hardware_broadcom_wlan" groups="broadcom_wlan" revision="refs/heads/cm-12.1" />
<project path="hardware/cm" name="CyanogenMod/android_hardware_cm" revision="refs/heads/cm-12.1" />
<project path="hardware/cyanogen" name="CyanogenMod/android_hardware_cyanogen" revision="refs/heads/cm-12.1" />
<project path="hardware/intel/audio_media" name="platform/hardware/intel/audio_media" groups="intel" remote="aosp" />
<project path="hardware/intel/bootstub" name="platform/hardware/intel/bootstub" groups="intel" remote="aosp" />
<project path="hardware/intel/common/bd_prov" name="platform/hardware/intel/common/bd_prov" groups="intel" remote="aosp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment