Jeff Brown b380c4d7ed resolved conflicts for merge of a05088c1 to master ...

Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521

2010-09-08 13:02:55 -07:00

..

binder

am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

2010-08-31 15:06:24 -07:00

camera

am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.

2010-08-30 14:06:16 -07:00

gui

Modify native ALooper to take an explicit ident.

2010-09-07 15:46:55 -07:00

hwui

Add support for Canvas flags on save.

2010-09-01 15:49:25 -07:00

rs

Merge "Reflected class name and bc file name changes."

2010-09-07 22:28:20 -07:00

storage

Reorganize MountService IPC

2010-08-20 13:17:12 -07:00

surfaceflinger_client

am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread

2010-08-27 16:18:12 -07:00

ui

Add support for secure views.

2010-09-08 11:50:55 -07:00

utils

am 2a08e2a9: am a19ef306: Revert "Free created FileMap when uncompressing files"

2010-09-07 19:41:00 -07:00