tree cf8addd3a76c71e9a79dc0175e0293c0b81096d0
parent e774bdd6f09a65886429a2d84a6af7e4b6352280
parent 3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07
author Ian Pedowitz <ijpedowitz@google.com> 1440808289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440808289 +0000

am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev

* commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07':
  Show the ResolverActivity in dock mode