tree 730a884bf2035d51cbaf54b583ee775a06d7698a
parent d47679e26a2f59ef5d364cb5b5d75a7c15def124
parent e598a85e324fcfe11fe27a90ad7e8954b78f4c01
author Patrick Scott <phanna@android.com> 1260239550 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260239550 -0800

am e598a85e: am 0b888f34: Use the application icon as the launcher icon.

Merge commit 'e598a85e324fcfe11fe27a90ad7e8954b78f4c01'

* commit 'e598a85e324fcfe11fe27a90ad7e8954b78f4c01':
  Use the application icon as the launcher icon.