tree d893dbab646c43cd3ea238865bcc1467d7796d28
parent db146820b7621d0e339e1cc65dbda952f0eafb74
parent 88eefe43bfbce822372ac430dcd119b9c0c7518c
author Winson Chung <winsonc@google.com> 1389912707 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389912707 -0800

am 88eefe43: am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit

* commit '88eefe43bfbce822372ac430dcd119b9c0c7518c':
  Updating screen background assets. (Bug 12136457)