Go to file
Evan Millar c7e9defdd3 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
2010-06-21 12:10:55 -07:00
awt Add correct copyright headers to multiple files 2010-03-11 18:22:10 -08:00
camera Change camera interface to support multiple cameras. 2010-06-11 16:47:33 +08:00
cmds keystore: rephrase the comment to make the usage more clear. 2010-03-17 16:31:20 +08:00
include Even more native input dispatch work in progress. 2010-06-17 13:27:16 -07:00
libs Even more native input dispatch work in progress. 2010-06-17 13:27:16 -07:00
opengl merge from froyo-plus-aosp 2010-06-21 11:23:45 -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 Adding PacketVideo attribution in NOTICE. 2010-05-06 14:15:47 -07:00