tree 3143cc48260e8268e75176893d0fa79695a38d65
parent 3d6225b4e27190d92bf1afebca5538865a514491
parent 98bf27bff49b416802474cccf74f14f51620f560
author Lucas Dupin <dupin@google.com> 1492102318 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492102321 +0000

Merge "Add transfer mode support to ShapeDrawable" into oc-dev