tree 61e82ffe87bb8c1defc5250fcf64c82dded07bc7
parent cb4fcc7ef75c33411d2b900db7933c5bc4336527
parent dd7419d90cda5c52e81491bea3cf3c3f4e0535c7
author Paul Soulos <psoulos@google.com> 1405459003 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405440345 +0000

Merge "Adds secondary icons and intents to entries if they exist" into lmp-dev