tree d3dd608a57978344e8ce77b8bf930ffe924a538a
parent b2d57c9adae190a9791cd68dbeef635423e7bb95
parent 2e6e9b879591068864c4623f414e792707aa2aca
author Sunny Goyal <sunnygoyal@google.com> 1433526721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433526721 +0000

am 2e6e9b87: Merge "Updating assets" into ub-launcher3-burnaby

* commit '2e6e9b879591068864c4623f414e792707aa2aca':
  Updating assets