tree 28c93ecd5067f4cb98565bc37b952369a16a9b3e
parent c5feab282fde67e2a55777a67df7e3bb32ff31dd
parent 3447541c8f1f7c6c08a2b66e20275d2919e443b9
author Divya Sharma <c_shard@codeaurora.org> 1446658545 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658545 -0800
mergetag object 3447541c8f1f7c6c08a2b66e20275d2919e443b9
 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/gZqxDngYRgCfZHeX6wUKGpz7oQgbKlcZY4Qa
 AcEAn1p+WRHND26+OgaWKIvMp/A5M7gu
 =muAQ
 -----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
  Import translations. DO NOT MERGE
  STK Call Control feature implementation.
  Import translations. DO NOT MERGE

Change-Id: I44f685ed7d815c265e56eaf376bf52acb0c7b813