am ab6aab14: Mako: NFC: Disable listening for Nfc-B on eSE.

* commit 'ab6aab14904c0625ceff3595d611011d786ab031':
  Mako: NFC: Disable listening for Nfc-B on eSE.
Mako: NFC: Disable listening for Nfc-B on eSE.

PN544 picks up Nfc-B sometimes, but we always want p2p.

Bug: 7116938
Change-Id: I4212fccf1204e12fca4f7facd0c025dbc7d6b435
am 15dbdc49: am ab6aab14: Mako: NFC: Disable listening for Nfc-B on eSE.

* commit '15dbdc49d4a4c8c451b5f53fa1397a1affc27601':
  Mako: NFC: Disable listening for Nfc-B on eSE.
Merge "mako: change group ownership of /dev/mdm from system to radio" into jb-mr1-dev
am 98dd560b: Merge "mako: change group ownership of /dev/mdm from system to radio" into jb-mr1-dev

* commit '98dd560b6f1a2e503e65c6953e242deb5d1d69a5':
  mako: change group ownership of /dev/mdm from system to radio
am ab6aab14: Mako: NFC: Disable listening for Nfc-B on eSE.

* commit 'ab6aab14904c0625ceff3595d611011d786ab031':
  Mako: NFC: Disable listening for Nfc-B on eSE.
am 98dd560b: Merge "mako: change group ownership of /dev/mdm from system to radio" into jb-mr1-dev

* commit '98dd560b6f1a2e503e65c6953e242deb5d1d69a5':
  mako: change group ownership of /dev/mdm from system to radio
am 26cb43c8: am 98dd560b: Merge "mako: change group ownership of /dev/mdm from system to radio" into jb-mr1-dev

* commit '26cb43c80086d9a2aa99e341396a87faae8963af':
  mako: change group ownership of /dev/mdm from system to radio
merge in jb-mr1-release history after reset to jb-mr1-dev
mako: disable standalone power collapse

Disable standalone power collapse to fix:
-- L1 cache error;
-- Krait core watchdog timeout issue;
-- Failure to wake from suspend (RPM-assisted resume takes over with this
   disabled)

Bug: 7253403
Bug: 7111335
Change-Id: I6bedbe7a3d81cd7066514f635d47f1ba1947a96f
Signed-off-by: Iliyan Malchev <malchev@google.com>
am 546e5785: mako: disable standalone power collapse

* commit '546e578579b678178095c95af8ba99b20894f86e':
  mako: disable standalone power collapse
am 546e5785: mako: disable standalone power collapse

* commit '546e578579b678178095c95af8ba99b20894f86e':
  mako: disable standalone power collapse
am 634cafde: am 546e5785: mako: disable standalone power collapse

* commit '634cafdec8ae9269f811517b492e39b3488033e1':
  mako: disable standalone power collapse
Merge from jb-mr1-aah-dev

Change-Id: Id8ca9cb006c206ba45c2008d0c84499ae334f55e
am b62cedaf: Merge from jb-mr1-aah-dev

* commit 'b62cedaf161b034f0a9634dfad7303bd7ca421d6':
  Mako: NFC: Disable listening for Nfc-B on eSE.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
mako: disable standalone power collapse

Disable standalone power collapse to fix:
-- L1 cache error;
-- Krait core watchdog timeout issue;
-- Failure to wake from suspend (RPM-assisted resume takes over with this
   disabled)

Bug: 7253403
Bug: 7111335
Change-Id: I6bedbe7a3d81cd7066514f635d47f1ba1947a96f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Final shuffle to make /sdcard work in shell.

Move legacy mount location to /storage/emulated/legacy, and create
a symlink to point towards shell-visible FUSE daemon.  This symlink
is then masked from zygote-forked apps by a tmpfs.

Bug: 7255202
Change-Id: I9eb744656454333afc9169367c40d81323eea100
am 5221831b: Final shuffle to make /sdcard work in shell.

* commit '5221831b5dfc907a76e4a04a665902ff4c022aa5':
  Final shuffle to make /sdcard work in shell.
Fix issue #7257947 Need to fix heap limits on Mako

Change-Id: I9cee7db11df75fc70dedd043d0040b72cbd0b047
Allow traversal into /storage/emulated.

Bug: 7255202
Change-Id: Iee87a6a3f7abc756c8c7be1d9cb6546467c47ff2