tree 19160f5978cf299d785b44742ff20365e32e2109
parent 60337b6bd73bcf208c89c1d5ac6ff50d51c0700f
parent 8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d
author Ian Pedowitz <ijpedowitz@google.com> 1440808819 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440808819 +0000

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

* commit '8d027e6d523d13a9cf2a5cf4ef901cc3e78b901d':
  Show the ResolverActivity in dock mode