tree 0d5b1e4536c6ada930c3fc711a0306afb356baaf
parent 36914931c0ece74ce75c3140b4bcb4bdf23cf83e
parent 340b410675d8635cfb3521986cb31d82abfa945e
author Mengjun Leng <mengju@codeaurora.org> 1509300718 +0000
committer android-build-merger <android-build-merger@google.com> 1509300718 +0000

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

Change-Id: I5f35e53048993fee9af7731734aa5f87380c8148