am 07daeada: am 23118b46: am 7bd37b89: mako: wifi driver is no longer a module

* commit '07daeadaaee3884d2a6dc5738ea6a4566ebdcf44':
am cbca39c1: am 827bd773: am 4810cd96: audio: Handset/Speaker Phone voice.

* commit 'cbca39c145b9498339392b4e3e2e5d99f7dea508':
am d50adf5e: am 3b6f3ade: am 605aa519: Reinstante diag_mdlog, keep it disabled

* commit 'd50adf5e796bc8aa0e49d29ec6b8ee087da5857d':
am 29cd4eaf: am 867a21ca: am 7582e4dd: mako: audio: enable the QACT connection

* commit '29cd4eaf46b4333d308c584275774d39c790dcac':
am 5792464e: am 8babb9c4: am 8408bbbc: Merge "No multiuser settings for phones" into jb-mr1-dev

* commit '5792464ef5eab63fd2b454c2e24c7a12809eb0db':
am d032fdd6: am c54be85f: am 3936e4a2: mako: adjust the haptic feedback

* commit 'd032fdd6298fae24c21823f47645fd14e1cd91bc':
am 186d0b89: am e783f036: am a2e41c49: Merge "Disable TextView fades" into jb-mr1-dev

* commit '186d0b8996eb02af633c5490b0332f581a4cb57b':
am ec04d2c9: am 9be72f42: am 671a26d5: Merge "Include user identifier in external storage paths." into jb-mr1-dev

* commit 'ec04d2c93caa8c70832b7e949f3f30ae2dc355f5':
am 8e94b5e6: am 565e8f03: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8e94b5e6bcae31bd3a498e8649f2853fb440bdfc':
am a4da2425: am 9bd0a5a0: am f35ee850: mako: increase first brightness range bound

* commit 'a4da242540145fda0eb432dae17edf53c2bea300':
am c5a3e2e1: am a93b6d09: am c1de8aaf: audio: apply audio tuning parameter

* commit 'c5a3e2e16992720c6934f67f9a3388fe65590ea3':
am 25cff45e: am 653f9850: am f493a43c: mako: disable to notify touch driver when charger is connected

* commit '25cff45e221ccef62ee6cd18d8b4a78885052c65':
am 8fc76ac1: am ea06d1ee: am 595ae243: fix build - specific TARGET_ARCH

* commit '8fc76ac155af876117000ea32ccde8253740e8cf':
am 8026063c: am 6b56e087: am 4e49764e: One more legacy symlink.

* commit '8026063cda5281d49cb4e0677d2656963397fb36':
am a499c9b9: am ff59c4ce: am cb1aefed: Mako: NFC: Disable low-power tag detect.

* commit 'a499c9b95de854d8db293c649bc1ded7173e75e4':
am d1688b9e: am 278511a5: am 5884e3d0: Enable AAC 5.1 output Bug: 7099812

* commit 'd1688b9e1cedca7f18ca29a0849a9541e88c6138':
am 6eef8df1: am 76707c8e: am b471ee2e: Merge "audio: update tuning parameter" into jb-mr1-dev

* commit '6eef8df1a1bbe45341b8cf33690846d9ba77dcd2':
am cdd71ad9: am a75c42c9: am e0aa19fb: audio: Add property to enable low latency recording path.

* commit 'cdd71ad9b438e6ab9984802be74918e4d1cfcbb4':
am 37ca63a3: am 646093a1: am 9d7ffe79: Merge "Update config.xml overlay for new key config_overlay_locationProviderPackageNames" into jb-mr1-dev

* commit '37ca63a377463c8b1318b6392afd9aa7c8af2713':
am d4c44aa6: am 0f22e2a0: am baf3522b: audio: modify config files for lowlatency implementation

* commit 'd4c44aa649b2e632aad15eb67fedf0d70afdd5c1':