Go to file
Conley Owens 4c30f1027a Merge commit 'f395e304' into m
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
2011-05-02 10:25:55 -07:00
cmds Replace a custom AndroidRuntime::findClass with a more targeted fix. 2011-04-13 16:43:15 -07:00
include get rid of dependency on copybit HAL module 2011-04-28 19:50:21 -07:00
libs Merge "Implement support for ALT and SHIFT modifiers" 2011-04-29 09:59:55 -07:00
opengl get rid of dependency on copybit HAL module 2011-04-28 19:50:21 -07:00
services/surfaceflinger am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 2011-05-02 10:12:00 -07:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00