am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit '3eb9f832':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.

am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread

* commit 'e1d14a29':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.

* commit '34e9f249':
  Disable plugins if setPluginsEnabled(false) called.

See https://mondrian.corp.google.com/changelist/110819-p9

Change-Id: I35fc65752687322ddfec39f5e2d7e5e5b89951e7

Change-Id: Id5ea2fcfa0bcd45198e773a5842d39eacc8ae400

Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae

Don't emit tar blocks for directories with an invalid nonzero size.  Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.

This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.

Change-Id: I625173f76df3c007e899209101ff2b587841f184

The usage feedback will be used for achieving per-method
(email address, phone number) ranking improvement.

Bug: 4371572
Change-Id: I602c0b83afca674904946f59bbdfc4dca07d46e4

Change-Id: Id3a1b33a222790214820af4a8b49378f08e53558

Change-Id: I06ee6a44c6e102ed84b44c68a83ab7db29d9f160

am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit 'c8c39b6c':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit '92593dc4':
  Clear IP configuration on lost network

am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

* commit '752a5b3d':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.

* commit '4c5f2a9d':
  Prevent allocation overflows by corrupt NDEF records.

Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9

We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005

Part of a larger Calendar provider change.

Bug 4473786

Change-Id: I0cb4260ea590da0c48b55d0ca3ee586e00d37b36

* commit '1f866589':
  Add SIM PUK unlockscreen.

Bug: 3378764
Change-Id: I4697b814337270c4458ca2b8ce358de315904777

The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc

Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd

Allows controlling the timeout for transceive on Felica.

Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938

Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86