Go to file
The Android Open Source Project 7cdc711750 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
awt auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
camera/libcameraservice AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting. 2009-03-27 18:18:46 -07:00
cmds auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
im/java/android/im auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
include AI 143320: am: CL 143171 am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor 2009-03-27 18:11:38 -07:00
libs Merge branch 'readonly-p4-master' 2009-04-02 10:31:50 -07:00
opengl Automated import from //branches/master/...@142578,142578 2009-03-25 15:12:17 -07:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00