am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp

Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'

* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':
tree: 9a7df8ac6775e0425ea28e429e271d85701b7710
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE