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

..

1.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

2.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

3.xml

AI 144009: am: CL 144007 am: CL 144006 Set a real 3.xml, which is the current candidate cupcake API.

2009-04-02 08:58:10 -07:00

current.xml

Merge branch 'readonly-p4-master'

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