Wink Saville 05b1d174a6 am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE ... * commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47': Remove SIM operator name hack		2011-05-17 20:38:05 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2	2011-05-13 11:21:26 -07:00
libs	am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2	2011-05-13 11:21:26 -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