Go to file
Nick Pelly 2a734d952c am c0e93a84: am 7ea5c45e: NFC settings cleanup.
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'

* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
  NFC settings cleanup.
2010-10-21 13:50:09 -07:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include Revert "Add length-equality test in String operator== checks." 2010-10-20 17:06:28 -07:00
libs resolved conflicts for merge of 368fdba4 to master 2010-10-21 07:39:10 -07:00
opengl am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-21 13:48:50 -07:00
services/surfaceflinger am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread 2010-10-21 13:48:36 -07:00
vpn Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources. 2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE Add missing NOTICE entries. 2010-10-19 16:56:02 -07:00