commit bd51a791d89f5b6e983d08951a490f435956bc77
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:55 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:55 2015 -0800
tree fe98c6a5d250b1b55a42f953a0a4adc1cecf74bb
parent d2dfb8d32fcdad9b39c72c0a9ed13b0a098e24ca
parent 5300af9c545cfd9a04de7e76977495ca4028268b

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