tree 70c0b021becd869f063092a460d681354dffd809
parent a03a145bd171a122da50a651474bb993d64a2959
parent 65dc5b0ff1f57f44d1f35229d26306f39ddec283
author Divya Sharma <c_shard@codeaurora.org> 1446658534 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658534 -0800
mergetag object 65dc5b0ff1f57f44d1f35229d26306f39ddec283
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052356 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgQACgkQ6K0/gZqxDngajQCeOmiZxUlvc6TeyteBzYgPaWmu
 LXkAn2NEsmgSvH/5AUmlFgfHMcKJkQ7S
 =xBqj
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE
  Fix for safe_media_volume regulation. Equalizer range up to 10 dB
  Import translations. DO NOT MERGE

Change-Id: Ie3abf43605e7e177e79a3d7f5b8daf49ec10eb5f