tree 7e9f977bd475e2a989e1004df5b9501558d1a224
parent f077abb00ba4003738c3ca5c8133e2e3d22692c6
parent 4855cc3dd5a057f435c5ce540a844e46ea76d758
author Wonsik Kim <wonsik@google.com> 1442212680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442212680 +0000

am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '4855cc3dd5a057f435c5ce540a844e46ea76d758':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again