tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 06bff1659d12c2325b6ec1a51e8f6c13b3519c54
parent 434f2fbc8209ed7d75313dc966f5f4e082cbf9ef
author Sunny Goyal <sunnygoyal@google.com> 1422669708 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669708 +0000

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

* commit '434f2fbc8209ed7d75313dc966f5f4e082cbf9ef':