am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb

* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.
tree: ea8394774dd2af9d10699c0198d5639d47f212a6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE