Forgot this in merge resolution.

Change-Id: Ieb26ec5fc333743b86d414ee558c978334647853
2 files changed
tree: ba7b45c5c6927dffc957b1f377ffd4a8eafe36f7
  1. client/
  2. include/
  3. server/
  4. Android.mk