Wink Saville 656b373568 am a736cd54: am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE ... * commit 'a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00': No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.		2011-07-08 12:28:27 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "Add Thread::join"	2011-07-06 11:37:53 -07:00
libs	Merge "SurfaceTexture: enable newly passing tests."	2011-07-07 14:42:12 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "don't kill surfaceflinger when system process dies"	2011-07-06 11:10:31 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00