Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
tree: 5199b35ac2e3e338ef2f9e54fa89849325760987
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE