Jean-Baptiste Queru 843ff92bb0 resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp ...

Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d

2010-10-20 18:16:57 -07:00

..

config

…

java

resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp

2010-10-20 18:16:57 -07:00

jni

am db723ea0: Merge "jni: Remove duplicated jniThrowException()"

2010-10-19 15:22:13 -07:00

res

am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread

2010-10-20 14:04:00 -07:00

tests

am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

2010-10-18 13:56:31 -07:00