tree 99a4b9b91a4c31bc0d49a74402f9d9c8a66c2b13
parent c723fb132fd3a9c767f6d081c567b36240366df6
parent 7b7476c7a38357347674f549bff83fd531529c22
author Winson Chung <winsonc@google.com> 1337629405 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337629405 -0700

am 7b7476c7: am 907a6fc9: Merge "Updating launcher assets.  (Bug 6499087)" into jb-dev

* commit '7b7476c7a38357347674f549bff83fd531529c22':
  Updating launcher assets.  (Bug 6499087)