Christopher Tate ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev ...

* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257

2014-03-05 16:17:34 -08:00

..

accessibility

add new accessibility action for EditText to set text content

2014-02-20 20:05:34 -08:00

appwidget

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

backup

am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev

2014-03-05 16:17:34 -08:00

core

Balance calls to setStreamMute.

2014-03-05 17:36:24 -05:00

devicepolicy

Merge "Enables a profile owner or device owner to set and clear default intent handler activities."

2014-02-24 10:16:28 +00:00

java/com/android/server

Merge "Avoid duplication of AppWindowToken in created Task"

2014-03-04 15:19:17 +00:00

print

am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

2014-02-11 08:33:50 +00:00

tests

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

usb

Add support for USB devices with multiple configurations and alternate interfaces

2014-02-27 09:59:02 -08:00

Android.mk

Make UsbService optional

2014-02-18 14:57:09 -08:00