Jean-Baptiste Queru f389f2820c resolved conflicts for merge of 7749a1c5 to jb-mr1-dev ...

Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97

2012-09-05 12:21:50 -07:00

..

java

resolved conflicts for merge of 7749a1c5 to jb-mr1-dev

2012-09-05 12:21:50 -07:00

jni

update to new SurfaceComposerClient API

2012-09-04 20:23:23 -07:00

res

resolved conflicts for merge of 7749a1c5 to jb-mr1-dev

2012-09-05 12:21:50 -07:00

tests

Remove Binder.getOrigCallingUid().

2012-08-31 15:11:13 -07:00