am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread

* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list
tree: 3df13b324209e6ab022e8508522255c975507533
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE