tree f5ee6b6b03b039d9d9180521b59cc21453713804
parent 4f6ae7bbaa4654e14d70e9fa503ceb713c90c342
parent f7375b46ff9848feba0a9632669d07384954d69e
author Ji Yang <yangji@google.com> 1464278078 +0000
committer android-build-merger <android-build-merger@google.com> 1464278078 +0000

Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e