Merge "Fix NPE on devices that don't have NFC." into ics-mr1
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0

* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
Re-enable vril-dump for adb bugreport.

vril-dump was causing adb bugreport to hang on Xoom. The OEM fixed
the utility and we can now run it again as part of the bug report.

Bug: 5482585
Change-Id: I1db3b50c327d50d18fb9c6327c4cd521e09f3916
Tie screen saver to the screen off timeout.

The window manager now monitors the plug state; the screen
saver will never be automatically started if the device is
running off battery.

Change-Id: Ib1064d9cdd540238957df3ba7020303b0f6943c2
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
EGL: fix blob cache extension detection

Bug: 5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
Add a few GC-flexing microbenchmark tests

Added ObjectGc and FinalizingGc to stress single-object allocation and
collection with/without the presence of finalizers.

Also added GcOp() to the menu of available single-shot tests.

Change-Id: I36d3254dfe2e97e504f9e4f77c8addda98ab4f4b
Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes
am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1
am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0

* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286
am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0

* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690
am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio

* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
add a self instrumentation into framework perf app

It's essentially a test app on itself to facilitate
running the perf automatically.

Change-Id: I5aad3565e64719d219e76969a989ca80aa6df286
Reconcile with ics-mr0-release

Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
Fix a crash caused by SIP addresses containing "%40" instead of "@"

CallerInfo.doSecondaryLookupIfNecessary() was assuming that SIP addresses
would always contain the character '@', but that's not always true since
the username/domainname delimiter can actually be "%40" (the URI-escaped
equivalent.)

This would cause the in-call UI to crash if you ever called a SIP address
like "xyz%40example.com".

TESTED:
 - Make an outgoing call to the SIP address "xyz%40example.com"
   ==> The call ultimately fails, but the in-call UI no longer crashes when
       it first comes up.

Bug: 5637074
Change-Id: I62d15a7ccd509924d38b780b92e657b9efa26125
Merge "GLES: add image external enums" into ics-mr1
Add the support libraries to the platform documentation (build).

Updated the make file to generate documentation for the support libs.

bug:5629339

Change-Id: I44222f78d002660ad52610083421e4b840ceb541
SurfaceTexture: fix a bug with buffer reallocation

This change fixes an issue involving buffer reallocation and the
ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture.  The bug happened
when the buffer slot currently attached to the GL texture was selected
for dequeuing, but the dequeue operation caused the buffer to be
reallocated.  Because the buffer is new, the image producer could fill
the buffer and queue it before an updateTexImage call, which would
result in the "slot %d is current" error in queueBuffer.

Bug: 5631630
Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d