tree 48b14a6d60c37c502be22ebc1c14a4727ed19b1d
parent d53dd6fd3ff4b6d5c5992b4d60cf90cfdecbe31c
parent a5e2aa99c08f2d49a2485c7e931f38f12dd82290
author Adrian Roos <roosa@google.com> 1465854906 +0000
committer android-build-merger <android-build-merger@google.com> 1465854906 +0000

Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0