am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread

Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'

* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
  Fix proguard flag file dependency.
tree: 6948868fce1e6ea9301a77e49d9880f8df2e7449
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE