tree 2c60131f69786ab27dbd091a445a9398b0d45654
parent b9930418b1f3c2057623915eec76f944f386e577
parent 3f7ecd9bc53869d95466b7a583e7804c86b9eeee
author Wonsik Kim <wonsik@google.com> 1442708013 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442708013 +0000

am 3f7ecd9b: am 976fbb0c: am cc4aff99: 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 '3f7ecd9bc53869d95466b7a583e7804c86b9eeee':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again