commit | 97e29db84e8572644a3e60868eac1e563d1f72bc | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 30 21:05:15 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 30 21:05:15 2016 +0000 |
tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
parent | 2aadcab54d46643b2a520bce4732b7bcce1562c4 [diff] | |
parent | 0e7510805d705fc85d0bd0b3b57108010e65f555 [diff] |
Merge "Merge \\"Fix TintContextWrapper not always handling vector assets DO NOT MERGE ANYWHERE\\" into nyc-dev am: 1e87f4ec3f -s ours am: e8596ba982 -s ours" into nyc-mr1-dev-plus-aosp