tree 80bfb8d3119ed66c214260e82f5bab0f28bc7dd0
parent 5e362c871a7b79b12e91a8737606988163f84dcf
parent 4b95c2bbf096b6438673659547914ae61ac4f127
author Greg Hackmann <ghackmann@google.com> 1386095728 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386095728 -0800

am 4b95c2bb: Merge "add libadf"

* commit '4b95c2bbf096b6438673659547914ae61ac4f127':
  add libadf