tree d922546ec223bf6442467c9ef9efc6fc7d5646bc
parent 7d62a9187bf217d32d1e3edc047285380ee30d2a
parent a05bd3c1cdff400ad92532b06d40ddc5c638c284
author Nick Kralevich <nnk@google.com> 1428711326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428711326 +0000

am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit 'a05bd3c1cdff400ad92532b06d40ddc5c638c284':
  Fix integer underflow in ESDS processing