Merge e0957dce90c1e2d70ded7de0d99078388669483c on remote branch

Change-Id: I970cc5edb1037af54fc4df007958017a540f9465
tree: b772087e429887967abbaf05c22e8d283b08a3df
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE