OSDN Git Service

am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 1 Oct 2014 22:36:15 +0000 (22:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 22:36:15 +0000 (22:36 +0000)
commit9cb9286dc246f54743913b1ae20c045e49810c49
tree0a650ee87dee4467ecd3ccaa9607087da49443b4
parent001d85406847efeb54f7e7edb4233f68ea47c7dc
parentb0c216d3b95b3aa3a0a38ebde92ec19956598e9d
am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

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