| commit | 45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750 | [log] [tgz] |
|---|---|---|
| author | Zoltan Szatmary-Ban <szatmz@google.com> | Wed Oct 01 17:02:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 17:02:07 2014 +0000 |
| tree | 1b0302b2d699d35a180a4d7d718be8c2cf05fe81 | |
| parent | 5fdb8fa41d44fe31148f00b6c909f511f11fde52 [diff] | |
| parent | b0c216d3b95b3aa3a0a38ebde92ec19956598e9d [diff] |
am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev * commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d': Disambiguate categories in Settings > Trusted Credentials