commit 1c2c75d1574367e3827d586933c175752dda1040
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:36 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:36 2015 -0800
tree c675a13c57e8a985ddd23f429ac8a14586b680c8
parent e8a1aa8e44c912d81b338f32051494d3deee58df
parent b382188786a70a6fc6ba9037b3c3cafb6841d41e

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
  Grant WiFi override permission to NFC process.
  Import translations. DO NOT MERGE
  Support Mifare Classic tag.
  Fix peer-to-peer server register error if RF discovery is started.
  Support Mifare DESFire tag format
  Fix conflict vendor proprietary definitions.
  Reset P2P flag in de-initialization.
  Reset P2P flag in de-initialization.
  Import translations. DO NOT MERGE

Change-Id: I0177f830380ba1816ed8d8de19656ed87ebdc1dd