Go to file
Xavier Ducrohet e9265b771d am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit '2d5ed07940bc1966d4b55999634f05515e7fe197':
  Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 10:58:45 -08:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens" 2011-02-28 12:50:09 -08:00
libs Merge "surfaceflinger_client: Don't dereference NULL ptrs." 2011-02-28 12:50:25 -08:00
opengl am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:46:57 -08:00
services/surfaceflinger am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 16:04:42 -08: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