OSDN Git Service

am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Creden...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 1 Oct 2014 17:20:47 +0000 (17:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 17:20:47 +0000 (17:20 +0000)
commitb5550a65c089f230a58b636c9a55c61a054d169b
tree1b0302b2d699d35a180a4d7d718be8c2cf05fe81
parent492f87288699dbf8bb521c4160688b73d241d454
parent45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750
am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
  Disambiguate categories in Settings > Trusted Credentials