am 49fc4a9d: am fe17db4c: (-s ours) Merge change I4db11d50 into eclair

Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp

* commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
tree: b032f8bbf13b94ebf027724d3e9e18cd79437379
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE