tree 7e1e9f93bb9cb60500b572232af8b373d1242b79
parent 307b9f19b95bbd225776774f4f558432209cbe74
parent 1e87f4ec3f380048e1044d5d0a51aabad21b139c
author Chris Banes <chrisbanes@google.com> 1467405824 +0000
committer android-build-merger <android-build-merger@google.com> 1467405824 +0000

Merge \"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\" into nyc-dev
am: 1e87f4ec3f  -s ours

Change-Id: I668429a66b5046dd0c968ea1442da9c2500dcf94