Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9

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

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

This change adds a generic Property facility to the SDK, which allows an
easy way to reference fields (private or otherwise) in a general way.
For example, animations can use this facility to animate 'properties'
on target objects in a way that is more code- and compiler-friendly than
the existing String-based approach (for objects which have implemented
Properties, of course). The animator classes have been updated to use
this new approach (in addition to Strings, which are still more generally
useful for objects which have get/set functions but not Property objects).

The change also includes new Property objects on View (which can now be
used in creating animations on Views).

There is an unrelated change on GLES20RecordingCanvas to change the way we
cache bitmaps, which avoids spurious garbage by using an ArrayList instead of
a HashSet.

Change-Id: I167b43a3fca20e7695b1a23ca81274367539acda

PTP mode will be implemented as a separate USB function instead.

Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>

Also added name for new PTP USB function

Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Ie24ef844bdaf07a6aee848a04a49d0845b52ee64

- Also fixed hashCode

Change-Id: I4ef4bf42e4b73d11e23a89c5df3947411e654c04

Will be launched by Settings when presenting detailed network data
usage for a specific application.  Offers easy access into application
settings to change behavior.

Change-Id: I4ee0fdbc69f6a800ad59aca8db6b21f15ca71a66

When given a start/end range, interpolate between buckets to return
the total network usage.  Used to summarize detailed UID stats.  Method
to combine NetworkStatsHistory regardless of bucket size.  Used to
combine all histories matching a template.

Added tests for both methods.

Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882

Collect UID-granularity network stats during regular poll event.  Add
dumpsys argument to generate fake historical data for debugging, and
move stats parameters to Settings.Secure.

Change-Id: I09b36a2955dc10c697d4b9c3ff23dcb3ac37bd70

Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91

1. No clearing the last touch explore event in all cases
   when transitioning to another mode.

2. Incorrectly assuming the the action index of an up/down
   events is 0.

bug:4551506

Change-Id: I43f8e800b54a340968489dc924a539795a9195cb

Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4

am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE

* commit '7f13d0ed':
  Preferred network discrepancy after rild is restarted.

* commit '31ced5c1':
  Fix NPE in the statusbar.

am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

* commit '6aa152a1':
  Remove discoverable timeout handler. DO NOT MERGE

* commit 'e046555b':
  Fix build.

am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2

* commit '61220e88':
  Revert velocity damping. Bug: 4364920

am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2

* commit '55cc25c1':
  Simplify spot tracking logic. Bug: 4124987

Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361

* commit '5e4d0206':
  Handle AsyncChannel disconnect in WifiService

am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2

* commit 'c3709f25':
  Improve browser scrolling when using the mouse wheel.