| commit | 654078f583bcd58ba1c73986a455e444c12080fe | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jul 28 18:10:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 28 18:10:44 2014 +0000 |
| tree | 130a99d36e58db6cb9606e5ee54caec3cb4978e2 | |
| parent | 32644479e668216bd9943bcb31010080aeb0bfa9 [diff] | |
| parent | 22d9a81fd5f77f57051ad46d51b085bdc2944e5a [diff] |
am 22d9a81f: am 85fdc823: am df171680: am 009ec47d: am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aosp * commit '22d9a81fd5f77f57051ad46d51b085bdc2944e5a': DO NOT MERGE: Add a way to get all values of an attribute of DN.