Go to file
The Android Open Source Project cd3c19ae15 Merge branch 'open_source' into google_internal
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
2009-03-29 08:55:27 -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 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
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