Chris Craik 81997fef18 am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" ...

* commit '3cb74d21b2ac2427e805f72a113e8d7a2cc460f3':
  libhwui: Handle the blurImage() implement once RS::init fail

2014-05-05 21:53:56 +00:00

..

androidfw

am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:34:11 +00:00

common_time

resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

2014-03-27 12:50:58 +00:00

hwui

am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail"

2014-05-05 21:53:56 +00:00

input

am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"

2014-04-30 01:19:52 +00:00

storage

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

usb

resolved conflicts for merge of 22d07464 to master

2014-03-27 14:22:47 +00:00