Jaikumar Ganesh 17dc5870b2 am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" ... * commit '0c2d82c6f28ab6ec73d66fcc1f62e067829df426': OBEX: Fix PrivateOutputStream small write problem		2011-05-20 10:51:25 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	2011-05-19 19:34:21 -07:00
libs	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	2011-05-19 19:34:21 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-04-29 17:15:35 -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