Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

This reverts commit 52cba5d41789583c4f9403f284d4b579d9da4798.
Update cache sizes for the new unified path cache

Change-Id: I03d8a4f8c651a3ec69b794d8c1e7b3f15847af40
Merge "Update cache sizes for the new unified path cache" into jb-mr2-dev
am 09c3fa14: Merge "Update cache sizes for the new unified path cache" into jb-mr2-dev

* commit '09c3fa14e4edfbe07f21cc348a61f3cff91433a1':
  Update cache sizes for the new unified path cache
Rename texture cache flush rate property

Change-Id: I570d28ee25c0372da76ea4e1d2a9d4028f9e06ca
Merge "Rename texture cache flush rate property" into jb-mr2-dev
am eb82cff5: Merge "Rename texture cache flush rate property" into jb-mr2-dev

* commit 'eb82cff5eac7b2315366646683d0965057e4d060':
  Rename texture cache flush rate property
Merge "Initial security policy."
am 0d12b8f0: Merge "Initial security policy."

* commit '0d12b8f0379f2a98002b9c6a4050e764ffebbe95':
  Initial security policy.
am 0a284958: am 0d12b8f0: Merge "Initial security policy."

* commit '0a284958916cda4907a7e7478d6204733093d587':
  Initial security policy.
am 36463e5c: am 0a284958: am 0d12b8f0: Merge "Initial security policy."

* commit '36463e5cc23e18d470e22d1cc7ab60275430fb60':
  Initial security policy.
manta: prebuilt kernel (interactive governor iowait etc., tracing options)

5ddcd0d Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
bd6ea1e Merge branch 'android-3.4' into android-exynos-3.4
fbcad72 cpufreq: interactive: add io_is_busy interface
e43dde3 cpufreq: interactive: allow arbitrary speed / delay mappings
fe9919e ARM: exynos: manta: disable SCHED_TRACER, enable DEFAULT_TRACERS

Change-Id: Ic47442cf53e9e618a87a9fb41a157ea184fd14f7
am dfa60f1c: manta: prebuilt kernel (interactive governor iowait etc., tracing options)

* commit 'dfa60f1c1a0fe53702ff1fcc30c5ff4dfa91b6b2':
  manta: prebuilt kernel (interactive governor iowait etc., tracing options)
merge in jb-mr2-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-release - do not merge

Change-Id: I8bbac87277eb26ab85af8a6641c383e0cc89446b
am 8e3f8daa: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8e3f8daabb5974f4d866b12f9cc3c99053f8ba04':
  Revert "Manta: NFC: Enable UICC_IDLE timeout feature."
Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER.

Change-Id: Ifab1fdee6509c783d8f9678c521505532e0522e6
manta: wifi: Remove obsolete path to P2P FW

Change-Id: Ic776484f988a58861c50644b543c926313a684e2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am b5052953: manta: wifi: Remove obsolete path to P2P FW

* commit 'b5052953bd7d4d87b3b54575d356c6bf006fb641':
  manta: wifi: Remove obsolete path to P2P FW
am 2b8f8ddf: am b5052953: manta: wifi: Remove obsolete path to P2P FW

* commit '2b8f8ddfa18fd67e9dfeb98e80d0b14a5447cd80':
  manta: wifi: Remove obsolete path to P2P FW