tree cdec8ea4792373fcb5aec07d399cbcfa28c247fc
parent 1290b89d85141ef08bca1032525989f00e8efca7
parent 002a48f3619d5eec358e94a6e901a44d4b4a3cb7
author Mengjun Leng <mengju@codeaurora.org> 1509301548 +0000
committer android-build-merger <android-build-merger@google.com> 1509301548 +0000

Merge "Add support for send Message with messaging options" am: 1400db6748 am: 340b410675
am: 002a48f361

Change-Id: I03c4dce0682a4c1f8b5fffd9501e006668deff2a