tree 99a4b9b91a4c31bc0d49a74402f9d9c8a66c2b13
parent 6aa0fcbdbc4e979ecec670c9e3a0fdfac7673d5a
parent 907a6fc9d6c6bce4c7f8ddb6504e00ae6315c9b0
author Winson Chung <winsonc@google.com> 1337302014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337302014 -0700

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

* commit '907a6fc9d6c6bce4c7f8ddb6504e00ae6315c9b0':
  Updating launcher assets.  (Bug 6499087)