am d88e0680: (-s ours) am 288471d8: DO NOT MERGE. Load assets in place instead...
am d88e0680: (-s ours) am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.
Merge commit 'd88e0680'
* commit 'd88e0680':
DO NOT MERGE. Load assets in place instead of deferring until draw.