resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp

Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE