John Wang f4e97bbd86 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE ... * commit '1f8665895f71904b9d757854277cb637841356c3': Add SIM PUK unlockscreen.		2011-06-08 14:46:04 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-07 17:52:30 -07:00
libs	am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2	2011-06-07 17:52:30 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -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