tree 28a8c6b41d30fa09c38841e1bf7b312aedcc6aa8
parent 69031d61fa4c0d16e906473da021581813a9c05d
parent 14d84f56c9f69a9929791d13dca2881756d0f6e7
author Android Build Merger (Role) <android-build-merger@google.com> 1485304579 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1485304584 +0000

Merge "Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev am: ae5d4ff831 am: 8d2ffaefaa"