am db9a64c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'db9a64c8f23ec133c8553e52e7c37aa2fe40bb31':
Merge remote-tracking branch 'aosp/master' into jellybean
Fixups for recovery.

Change-Id: I81ee86f121d1e87f66558d825b6ac86233d3e5c6
Revert "mako: enable pre-rotation"

This reverts commit 60ee89058a880801354843fd1ee4eb0536ab802d.
This change needs updated Adreno libraries, it's triggering a
stack abort in the current libgsl

Change-Id: Idfc28fb4a84b7b810b3236b46e10bbbe0533a256
Mako: NFC: make sure the eSE is selected by default.

On Mako the UICC slot is actually wired to the UICC,
causing a NFC SIM in the SIM slot to confuse the stack.
Hardcode the stack to use the eSE instead.

Bug: 7663784
Change-Id: I448e457baffe8e7474e5faafac6af8b88f0eacfa
mako: power: overall tuning of device power consumption

Previous power profile was tuned with msm_hsic_host wake lock issue.
So that profile didn't have correct values. This is tuned after fixing the
previous wake lock issue.

Bug: 6896823

Change-Id: I157fa251fc9bb85da895fdab62dbc877d6af1cf8
mako: Add custom emergency numbers of KR,BR

- KR(450) : 111,112,113,119,125 and 127
- BR(724) : 190

Bug: 7674052
Bug: 7644603
Change-Id: Iaef22d71084601a544c12aba6e226e5418f5cd28
am 2c22bef3: mako: power: overall tuning of device power consumption

* commit '2c22bef399bf9fc1289647858685b830f9bd654b':
  mako: power: overall tuning of device power consumption
Merge "mako: Add custom emergency numbers of KR,BR" into jb-mr1.1-dev
am aadb07dc: Merge "mako: Add custom emergency numbers of KR,BR" into jb-mr1.1-dev

* commit 'aadb07dc885b0788e59b2bb451cdd28b057c0428':
  mako: Add custom emergency numbers of KR,BR
telephony: Set property for custom emergency numbers for display purpose

Set property to configure the custom emergency list that is used for display
purposes only based on MCC.  This property will be read by qcril to append to
its internal list of emergency numbers.

Bug: 7455652
Change-Id: I50394c0e7dc67c96b980ecec45f81fcc2bdb1b7d
Signed-off-by: Iliyan Malchev <malchev@google.com>
am 8ba215cb: telephony: Set property for custom emergency numbers for display purpose

* commit '8ba215cbc11250ecd8bf2abd5d821fc5d0eccad4':
  telephony: Set property for custom emergency numbers for display purpose
Merge "Mako: NFC: make sure the eSE is selected by default." into jb-mr1.1-dev
am ea63b66c: Merge "Mako: NFC: make sure the eSE is selected by default." into jb-mr1.1-dev

* commit 'ea63b66c31f2ea951d4227628ac26bf9eb27547f':
  Mako: NFC: make sure the eSE is selected by default.
mako: reduce the power consumption in off-mode charging

In off-mode charging, we don't need to turn on CPU1 to CPU3.
So we turn off CPU1 to CPU3 in off-mode charging. By doing this
we can save 60mA.

Bug: 7429504

Change-Id: Ie5d58b6258b7b2d084674fa670f3cc41639a6fd2
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge "mako: reduce the power consumption in off-mode charging" into jb-mr1.1-dev
am 3ca2f5ef: Merge "mako: reduce the power consumption in off-mode charging" into jb-mr1.1-dev

* commit '3ca2f5ef536310f3053d87be03d4d6d7c653d493':
  mako: reduce the power consumption in off-mode charging
auto-generated blob list

Bug: 4295425
Change-Id: I6f312e4850ebef1de9899235a255661a649b9e17
mako: Set property for custom emergency number extention

This property will be read by qcril to add up the list of emergency numbers.

Bug: 7674052
Bug: 7644603
Change-Id: I5813e328b0bfcf1f0734868ed456237bb34b04e8
am eb7eae8b: mako: Set property for custom emergency number extention

* commit 'eb7eae8b8bfa320bc29c64a4490d94714705c3d0':
  mako: Set property for custom emergency number extention