Chris Craik f9075798d7 am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" ...

* commit '90eaf92e325457ccb30286879a2f92b7ba517c7d':
  Correct stride for drawing to cached glyph bitmap

2014-05-09 22:00:02 +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 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"

2014-05-09 22:00:02 +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