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

Skip to content
Commit 6317083c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-5.1.1_r23' into cm-12.1 

Android 5.1.1 release 23

Conflicts:
	src/com/android/bluetooth/map/BluetoothMapContentObserver.java

Change-Id: Idb110d4cec541c9adadfee672fe5f869e6ee9926
parents e8c9fbd3 014b90ed
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment