am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'

* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
  Add "none" for vold and deprecate mkobb -c
tree: 1f0d342cbed2ea50622e9a4e941d45ace6afca65
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE