Dan Morrill 7f5bbbd1d6 Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight."		2011-06-10 11:01:48 -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	resolved conflicts for merge of e2aa0490 to master	2011-06-09 17:50:36 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)	2011-06-07 15:02:53 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE