tree 8291513e3e8c9a072e23cce1f4dd9f0c95fb86ae
parent d46ff5de50b743a88c22d90d5542ad8454245c58
parent 65d0a198314ce49119d7448de206c273ccc97c6d
author Sunny Goyal <sunnygoyal@google.com> 1410184121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410184121 +0000

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

* commit '65d0a198314ce49119d7448de206c273ccc97c6d':
  Handling label and icon from SessionInfo.