Jeff Brown eb857f12d6 resolved conflicts for merge of f7adbe10 to master ...

Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7

2010-07-16 10:06:33 -07:00

..

binder

am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread

2010-07-15 23:05:39 -07:00

camera

Change camera interface to support multiple cameras.

2010-06-11 16:47:33 +08:00

gui

first step at implementing the native sensor support

2010-07-13 22:21:56 -07:00

hwui

Add support for BitmapShader.

2010-07-15 14:44:42 -07:00

rs

Merge "Fix include path problem."

2010-07-15 23:40:05 -07:00

surfaceflinger_client

Introduce official public NativeWindow type.

2010-06-30 15:32:04 -07:00

ui

Implement native key pre-dispatching to IMEs.

2010-07-15 22:05:33 -07:00

utils

resolved conflicts for merge of f7adbe10 to master

2010-07-16 10:06:33 -07:00