tree 07c05136d8fd70ffeefef9a559b5e8cb832e32ba
parent bf24de292afd24c288e5522f1d0082c9fb7ec268
parent 7e150264857034bd308fdb791e0de0d618f3e231
author Marco Nelissen <marcone@google.com> 1447176715 +0000
committer android-build-merger <android-build-merger@google.com> 1447176715 +0000

Merge "Fix overflow check so it doesn\'t reject legitimate files" am: 7534cb3a36
am: 7e15026485

* commit '7e150264857034bd308fdb791e0de0d618f3e231':
  Fix overflow check so it doesn't reject legitimate files