Back_Merge_N_MR1_To_Dev.

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