tree 317b1390a400c8496655e6ff053e585512448c01
parent 3b130dbd985653e4ffc301bce1a63aab28ecc704
parent 644f4076dd9452ac6e5596b111ec9e6386f5d0a4
author Wonsik Kim <wonsik@google.com> 1442051175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442051175 +0000

am 644f4076: am 1507bbb0: (-s ours) am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev

* commit '644f4076dd9452ac6e5596b111ec9e6386f5d0a4':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again