OSDN Git Service

am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)
commit45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750
tree1b0302b2d699d35a180a4d7d718be8c2cf05fe81
parent5fdb8fa41d44fe31148f00b6c909f511f11fde52
parentb0c216d3b95b3aa3a0a38ebde92ec19956598e9d
am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials