tree c028bfe537607823c37e2ffc8c713c73059d3130
parent fbd5cea098cd95118278063c7329d5408efacf50
parent ee5f04f19d6440810dae7d03e04cce3edcd9a83c
author Sunny Goyal <sunnygoyal@google.com> 1422685332 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685332 +0000

am ee5f04f1: am 434f2fbc: am 65d0a198: am 1c13ff56: Merge "Handling label and icon from SessionInfo." into ub-now-porkchop

* commit 'ee5f04f19d6440810dae7d03e04cce3edcd9a83c':