tree 96166c3733e06869dd56514bd7c8ec0b881db072
parent 8b808c71218ca5d19e55d595ac2187c9cf12739f
parent 6a229267a4d08cc5544c7ad540ce18cc5c44226d
author Sunny Goyal <sunnygoyal@google.com> 1410708399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410708399 +0000

am 6a229267: Merge "Updating screenpanel assets" into ub-now-porkchop

* commit '6a229267a4d08cc5544c7ad540ce18cc5c44226d':
  Updating screenpanel assets