tree 269dea8f6d7779c834822d262c58b9a5ff22e247
parent a99ec913e8ee64a7e94ddce779f616571fc90443
parent 7c7610521bf921dca07d7889a924ee4bfec2f62b
author Alex Klyubin <klyubin@google.com> 1406331713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406331713 +0000

am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aosp

* commit '7c7610521bf921dca07d7889a924ee4bfec2f62b':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.