tree 8291513e3e8c9a072e23cce1f4dd9f0c95fb86ae
parent 4e71785a1625e05a80eec090caff802fb91b2332
parent 1c13ff569170bec075ab9961fbc0eb1ca395696b
author Sunny Goyal <sunnygoyal@google.com> 1409931281 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409931281 +0000

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

* commit '1c13ff569170bec075ab9961fbc0eb1ca395696b':
  Handling label and icon from SessionInfo.