Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.

Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
Merge "Adding support for Cdma conference calling." into lmp-dev
am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit 'a6e2f22666db39df527cf6698abc2420c208f02c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '93b185e39c5e6a90d413ffa5a2eea740feb7364b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '91043364b95fe58225437e2220d497ef6e33edf6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
DO NOT MERGE Fix race condition between binder deaths

If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
Add hidden API to disable NFC (optional persist).

Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
am 8828d86e: DO NOT MERGE Fix race condition between binder deaths

* commit '8828d86e79424fc1c7b7d1f908e3450879d5cea0':
  DO NOT MERGE Fix race condition between binder deaths
Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev
Revert "DO NOT MERGE Fix race condition between binder deaths"

This reverts commit 8828d86e79424fc1c7b7d1f908e3450879d5cea0.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
Fix issue #17574819: Chrome browser process is killed...

...in background due to dying renderer process

Completely turn this off, for now.

Change-Id: I028eefc9b7e627d29569ef72d9ab940ac5960c7c
Merge "bootanimation: allow animation to specify background color" into lmp-dev
Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev
am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"

* commit '04c6d73fd0e4472505275688ef8497bc6697647c':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
Merge "Shorten the zen supertoast visible duration." into lmp-dev
Using wrong virtual view id When prefetching accessibility nodes.

When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit 'a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]