am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':
tree: 2c9be418dc575ea7b0be621d7d9020d814ddf050
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE