Marco Nelissen c048df0cd7 am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds ... * commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac': Make sure we don't read from invalid fds		2011-06-09 18:56:02 -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	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