aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-01-29 21:47:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-29 21:47:03 +0000
commit5b2076c73953c645ade9f76809b015b010d07fac (patch)
tree69002e3e81b4aeaf2231954174f4853c794fc211
parent6f704ff8785c7e565bcc12d3185cc20ca81afa0e (diff)
parent86647b2b1164eac053e39b4d4296df704da60d5d (diff)
downloadsdk-5b2076c73953c645ade9f76809b015b010d07fac.zip
sdk-5b2076c73953c645ade9f76809b015b010d07fac.tar.gz
sdk-5b2076c73953c645ade9f76809b015b010d07fac.tar.bz2
Merge "Add AssetRepository to render params." into studio-1.1-dev automerge: bb34195
automerge: 86647b2 * commit '86647b2b1164eac053e39b4d4296df704da60d5d': Add AssetRepository to render params.
0 files changed, 0 insertions, 0 deletions