am 6d36190a: (-s ours) am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.

* commit '6d36190a7379ec1783c6eb5a27c946118dd53648':
  Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
tree: 6fa9206a9b1028672f44ec63fb27853b20b083eb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE