tree e0b68aea605bb5b489237351ea40cf84bfbde2d2
parent b8d9e90918730d8bcfba162cf307ffedee777aae
parent 6e89070a42c1d8467903568dcef230afeaf1ddc9
author Sunny Goyal <sunnygoyal@google.com> 1408393961 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408161162 +0000

Merge "Updating virtual preloader assets" into ub-now-porkchop