Jean-Baptiste Queru 09f1e2b215 resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp ...

Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617

2010-09-10 09:53:43 -07:00

..

Android.mk

…

bctest.c

Start of work on passing around StrictMode policy over Binder calls.

2010-06-21 12:56:35 -07:00

binder.c

…

binder.h

…

service_manager.c

resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp

2010-09-10 09:53:43 -07:00