tree 42656bfb4f7ea1536b01147735e7ec94c3edc47e
parent 57e0972fa72e67726bf0a9d0e07834476ac04b51
parent 85e6cd15e9a29f76267ddcf226192c44a8954b6d
author TreeHugger Robot <treehugger-gerrit@google.com> 1497563112 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497563113 +0000

Merge "Fix Compat DecoratedMediaCustomViewStyle on API 24+ devices" into oc-support-26.0-dev