Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
tree: 9d52c784ebd68acfc44a2cdb06d7cf057bba2c91
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE