Michael Wright 3e320a0cac am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" ...

* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()

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

..

androidfw

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

2014-04-04 19:28:09 +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

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07: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

AArch64: Make frameworks/base code more portable

2014-03-27 12:30:42 +00:00