John Wang cf9e9a9611 am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE ... * commit '71030e536522449f34dc584fda94f34e7be6ee19': Add SIM PUK unlockscreen.		2011-06-07 13:16:09 -07:00
cmds
include	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
libs	am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-06 20:36:49 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp	2011-06-06 09:55:15 -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