Nicolas Roard 9863ba94f0 resolved conflicts for merge of bfd6805a to master ...

Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45

2010-05-11 10:40:11 -07:00

..

config

…

java

resolved conflicts for merge of bfd6805a to master

2010-05-11 10:40:11 -07:00

jni

am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo

2010-05-11 10:23:56 -07:00

res

am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo

2010-05-11 10:28:06 -07:00

tests

am 6bff8df8: am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo

2010-05-10 09:56:41 -07:00