am c65c5fde: resolved conflicts for merge of b7bad4f2 to honeycomb-plus-aosp

* commit 'c65c5fdec19913bc2723947a92e1379b90368a8f':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
tree: 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE