Compilation fix: N-MR1 merge

Change-Id: I575f541d9f578fb3608a1ce1ca001a5479207f56
1 file changed
tree: d2f31df8dec1d232df7e503c9c05874f89eb90f2
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE