The Android Open Source Project d3af727927 Merge branch 'readonly-p4-master' ...

Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java

2009-04-02 12:18:20 -07:00

..

java

Merge branch 'readonly-p4-master'

2009-04-02 12:18:20 -07:00

jni

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00