Merge "Rename carrier messaging API constant name." into nyc-dev
tree: 76af9c9bdf7bf69c04ae4b5ce43bf7c5dda18dfe
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt