tree 7241fffab912c68e39036add378d3a4435cf6d40
parent b9acaba7819062d35a1a58e4ec3f83f2f1b7f718
parent 5aa96df6bfc931235834b4a02321d911281a6fcc
author Nicholas Sauer <nicksauer@google.com> 1400369100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400369100 +0000

am 5aa96df6: Merge "Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366" into jb-dev

* commit '5aa96df6bfc931235834b4a02321d911281a6fcc':
  Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366