tree ecb040af135ffb1b31197a77489db38c7aecf6b9
parent d34846b70b7f6eb167722d45e0c717fa64116e90
parent 3fe4051430be1da4c1f119c165a4bb8b3a9dd499
author Sergio Giro <sgiro@google.com> 1440511909 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440511909 +0000

am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer

* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer