Fred Quintana 5bb9771ec7 resolved conflicts for merge of b8675943 to master

2009-11-24 11:39:32 -08:00

..

config

…

java

resolved conflicts for merge of b8675943 to master

2009-11-24 11:39:32 -08:00

jni

am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair

2009-11-22 22:17:07 -08:00

res

am a7ad3f6c: am 50a21f4d: add reboot() method to PowerManager

2009-11-19 17:45:39 -08:00