tree 7fb9e3edbdbb972e722566e938542214e9b08380
parent bd4093dc8f7bca7fc2c3850eaf72ec68bc798664
parent b4e379dd5a7dc764260ace7b73a782077ff10232
author Divya Sharma <c_shard@codeaurora.org> 1446680127 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446748298 -0800
mergetag object b4e379dd5a7dc764260ace7b73a782077ff10232
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052355 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgMACgkQ6K0/gZqxDni8+wCfdBQmjsjn66vdqDHywqw/pB52
 fQ8AmwQWGGaRqiJJi05CKn9fetwGOI6G
 =Mejw
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Force RAW to reduce latency on platforms that support it

Conflicts:
	src/android/AudioPlayer_to_android.cpp

Change-Id: I4a27e4e85b2a96a07717d970c2955d2c791c4927