am 1ef3c87b: am 3e407575: am cd755d89: Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILES

* commit '1ef3c87b0dcbe1cf0723037afbe7b1f4ccd64e7d':
am 64cd66e3: am 4ebec771: am 5d4c4663: Migrate sdcard0 to shell-accessible location.

* commit '64cd66e3a1961972a5b012c2cd243c35141a9e0e':
am 7e72a517: am 2ab1dbcb: am d67f8d25: Remove sdcard_rw group from ril.

* commit '7e72a517be136bffa03566295aaf01a658ee20c3':
am a67fa477: am d428d4a9: am 5b4a906d: mako: fix missing libstagefrighthw in platform.zip

* commit 'a67fa477b7a8fb44359913365913a61b075cd739':
am 2982d149: am 778b0d70: am defdded0: Mako: NFC: Enable p2p active mode.

* commit '2982d149e466adc12fd2f7ffbb1a7dedd81b18a8':
am 9d21bec2: am 2aba4dc3: am 9cb9ff30: Add support for per device bluetooth configuration.

* commit '9d21bec277bf39bf8430362e33f6cc20e1dd346f':
am 604a62a3: am 0d138cc0: am b56ef927: Mako bluetooth: enable pan nap

* commit '604a62a3a14be12ad094b2d49662c5e2de1ea14f':
am 0ac06fd0: am 1d65e20f: am 0bb6917e: gps: add gps configuration file

* commit '0ac06fd00710bab1d78fdfee7b66d2a4289275bc':
am b5d268bd: am e42eaa30: am f8d0dbf1: mako: fix to show bluetooth address

* commit 'b5d268bd88405232e9d604de1a941bcd5601cdf9':
am 99ac0cc8: am 8fba0e38: am 31d25cbb: audio: enable RTAC for audio calibration

* commit '99ac0cc8fc523063bd94a0adc9d11c5bc51f6182':
am de0e1de3: am 990e4069: am 360477d8: mako: remove tombstone

* commit 'de0e1de3e652b36b3e15a825fbdd0fce77fac813':
am 290a63f5: am ab55382f: am 94cb93da: mako: relocate MDM dump from /tombstones/mdm to /data/tombstones/mdm

* commit '290a63f5237a1bc1790323afed8b0131f7842f83':
am 31ce94d9: am 1e06d63f: am e64faf47: mako: partition change for 8G eMMC

* commit '31ce94d928d65eb47a2abf8551e85ac2e9394cb1':
am 547bf20e: am 59f7f4f3: am 524985af: mako: call setup_fs after mount_all

* commit '547bf20e1cb4653cbf15b55f6cd83517d2cc7660':
am 54937a87: am 7ce00715: am 70d0c2b2: mako: force-clean the image files

* commit '54937a8753805b1823d7d19353284eb62274597d':
am 84a598c2: am ab9fd818: am c2d40c7a: Iteration on multi-user external storage.

* commit '84a598c213dc57d2667900c400d285f0299e5977':
am d2e46afb: am 28a808d4: am 51e0a0a2: Revert "mako: call setup_fs after mount_all"

* commit 'd2e46afb0ea7385996095ab64f7daeb66aa8ef9f':
am 3feb6053: am 9836c878: am 3f3c1405: mako: fix setup_fs

* commit '3feb6053c0d6817b0749f6e31598f0e938235e6e':
am c32af3f3: am 5cd4484e: am 9a100422: Merge "Updated BTM_DEF_LOCAL_NAME to be "Nexus"" into jb-mr1-dev

* commit 'c32af3f39d313d64dc483bba2525d07b965239f9':
am e32cdd8d: am ca85fa04: am a7ca0814: Merge "Remove unused NTP servers from gps.conf" into jb-mr1-dev

* commit 'e32cdd8d21240488e0f4a4faf1cf85fd89c49351':