am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
* commit '3fa3721e8f771a6edc8acdd21f567af93ddea7e1': DO NOT MERGE Add images to ERI icon list
This commit is contained in: