tree 99a4b9b91a4c31bc0d49a74402f9d9c8a66c2b13
parent 7f47685e662aa4ba17c58d903bc474a35a730444
parent ef8ae815261187ab9d0dc9ef76fe7bcbe12440f2
author Winson Chung <winsonc@google.com> 1337301907 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337301907 -0700

Merge "Updating launcher assets.  (Bug 6499087)" into jb-dev