ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,148 Commits 2 Branches 0 Tags 54 MiB
C++ 79%
C 14.1%
Java 3.2%
Python 1.4%
Makefile 1%
Other 1.1%
36d4d5ce3e
Go to file
Dianne Hackborn 36d4d5ce3e Merge commit '1dac277f' into manualmerge 
Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java
2009-07-01 21:19:35 -07:00
awt auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
camera/libcameraservice am b8a10fe4: Allow setPreviewDisplay after startPreview. 2009-07-01 11:20:08 -07:00
cmds am 9fbeb7da: Merge change 4337 into donut 2009-06-17 15:38:33 -07:00
im/java/android/im auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
include am bd9aa793: Merge change 5593 into donut 2009-06-30 14:48:58 -07:00
libs am b8a10fe4: Allow setPreviewDisplay after startPreview. 2009-07-01 11:20:08 -07:00
opengl am c6f36ed5: Merge change 5352 into donut 2009-06-25 14:33:48 -07:00
vpn/java/android/net/vpn Add PPTP, L2TP/IPSec preshared key and other fixes. 2009-06-26 03:02:22 +08:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE Start using CLDR for some date-and-time strings and formats. 2009-05-15 10:15:50 -07:00