tree cd510ec889c4903a4758f177f0d0d0550345a043
parent 1f20ebeae3b97369603ee924cd19d8fa4a60ecb5
parent 9005ec378ecd281f52945b5baca87245543bbfbf
author Alex Klyubin <klyubin@google.com> 1411768725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411768725 +0000

am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs."

* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
  Switch from using base64 BIOs to encoding funcs.