tree f728c046af1661ee9d8197e6782fe004b5738af4
parent b56ea680fc3fa650370b539c229986f21d4ed512
parent 163236156f28449272e16193930692d2cc0011cb
author Chris Banes <chrisbanes@google.com> 1464199521 +0000
committer android-build-merger <android-build-merger@google.com> 1464199521 +0000

Merge "Fix text appearances not working in colored button styles" into nyc-dev
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: Ib26212b58dde81eeb222721d39df7ce66502265b