Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 9ee48408 authored by Divya Sharma's avatar Divya Sharma
Browse files

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (246 commits)
  "MDB08M"
  "MDB08L"
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
  "MDB08K"
  Reverting Android Security Patch Level string back to 2015-10-01
  "MDB08J"
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
  "MDB08I"
  "MDB08H"
  "MDB08G"
  "MDB08F"
  "MDB08E"
  "MDB08D"
  "MDB08C"
  "MDB08B"
  "MDB08"
  "MDB07C"
  "MDB07B"
  "MDB07"
  "MDB06B"
  ...

Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: I9c5ef065a99077ffcb5bc4fb862ec399b19663b8
parents 818ea555 358c8909
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment