tree 05f56e70007b9fdd0df14a7f72e69c755ea33df8
parent 35cdb5c89ff8b3318f54338520982475bbf704f4
parent 3371ce02b725abbd5304933862fc8e02821197c4
author Wonsik Kim <wonsik@google.com> 1442710823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442710823 +0000

am 3371ce02: (-s ours) am 93c38623: am c3708121: am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '3371ce02b725abbd5304933862fc8e02821197c4':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again