tree 7937a5f4c2a1b64edc49db8b50c877db75da5a69
parent 87937dbcd1cee800aa6cc9824bfc32b587d893bd
author Joe Onorato <joeo@android.com> 1275091191 -0400
committer Joe Onorato <joeo@android.com> 1275515326 -0700

Get the IconMerger working again.

Change-Id: I73719f4fd475a39d4c1245de45c6a13c31e6323b