Fix merge from mnc-dr-dev

Change-Id: I62c8c4ef7b3f62d72242b82c72010e22c5129f4c
4 files changed
tree: dab604f33b88f8f781ca2230b38dc96cea7180b5
  1. src/
  2. test/
  3. Android.mk
  4. LICENSE
  5. MODULE_LICENSE_BSD
  6. NOTICE
  7. README