commit | 7c79f662ef42162592895e2df0a04640012a0e19 | [log] [tgz] |
---|---|---|
author | Chris Banes <chrisbanes@google.com> | Thu Jun 30 21:04:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:04:41 2016 +0000 |
tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
parent | 775a698aac94458b1adc2fd59f7c2bde475d967e [diff] | |
parent | e156dfffc121ab4733e60ca826e64129fcd754b1 [diff] |
Merge \\"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\\" into nyc-dev am: 1e87f4ec3f -s ours am: e156dfffc1 -s ours Change-Id: Ib695be16e52ca7562d6ce2433645912dccf545c2