tree 72ba29a15f2425c09402c3de5ee0970745714023
parent c5121002e5988ba1be660f3fbdb2067776b079fe
parent 1507bbb00e78c297b1aca01f580f529b55009f94
author Wonsik Kim <wonsik@google.com> 1442047759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442047759 +0000

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

* commit '1507bbb00e78c297b1aca01f580f529b55009f94':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again