tree adafc074597a2214c701a6946ee013e97765a44c
parent 86dcb627078ea297c4337ed634fc3fe874e23897
parent 265737575440b2483b63d24bb218b6e9875de656
author Jae Seo <jaeseo@google.com> 1441910271 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441910271 +0000

Merge "MediaRouter: Handle WRAP_CONTENT in setViewPaddingBottom()" into mnc-ub-dev