tree aeb7fc9e172a20e7c0c00ff89799f9061fc1b04c
parent 99679bf4d845a80a5722da7759a4ee6e6d96d12c
parent 3c996ff7627ed38d88a7a22adf1149f6e05744ce
author Paul Soulos <psoulos@google.com> 1406594600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406594600 +0000

am 3c996ff7: am 946b25e4: am 97ed5019: Only one icon and separator per mimetype

* commit '3c996ff7627ed38d88a7a22adf1149f6e05744ce':
  Only one icon and separator per mimetype