tree fe98c6a5d250b1b55a42f953a0a4adc1cecf74bb
parent d2dfb8d32fcdad9b39c72c0a9ed13b0a098e24ca
parent 5300af9c545cfd9a04de7e76977495ca4028268b
author Divya Sharma <c_shard@codeaurora.org> 1446658495 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658495 -0800
mergetag object 5300af9c545cfd9a04de7e76977495ca4028268b
 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/gZqxDnifGQCdGqaVlWpj2wEKUZYSswDNIu7c
 BMYAnjF/5xMYBY0NfWab6cCFAzu2tXOe
 =YqEG
 -----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
  Import translations. DO NOT MERGE
  Remove PinnedHeaderListDemoActivity
  Consolidate CallSubject history and dialog.
  Import translations. DO NOT MERGE
  Add support for "call with note" in quick contacts.
  Import translations. DO NOT MERGE
  Check for WRITE_CONTACTS permission
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Add back READ_EXTERNAL_STORAGE permission for vcard import 1/3
  Import translations. DO NOT MERGE

Change-Id: Ie2266121a735a5aeabb3e8014ce194e56b34df2c