tree 5cff150baa785486279fc26b40c9cf0c22d4afda
parent aa1f512b93ada06d76c5b2d2692e1a131b38bfd0
parent e3d3016d46f53a75d4ae94fcbcb95a5593eb00a0
author Alex Klyubin <klyubin@google.com> 1411768477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411768477 +0000

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

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