OSDN Git Service

Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 1 Oct 2014 15:47:59 +0000 (15:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Oct 2014 15:48:00 +0000 (15:48 +0000)
commitb0c216d3b95b3aa3a0a38ebde92ec19956598e9d
tree1da730b3a2a18ed6fb90e942c199fd500acd10fb
parentf7b567081ef5f4daafdf0b229793323751e0d764
parentaf0f89ff913f91d97d5226fc48947cab92be4cbe
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev