tree 10da860fcff71886af91d082e31f0e1917926848
parent ccf8740be1c1dcd5d5176abf817c60f5af06b40f
parent 65d0a198314ce49119d7448de206c273ccc97c6d
author Sunny Goyal <sunnygoyal@google.com> 1422666499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666499 +0000

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

* commit '65d0a198314ce49119d7448de206c273ccc97c6d':