tree 26356da86e858df6d4b281f1b5f2b83a1d629d4c
parent 5b33306dba456ec906f7c9bd522681c1de137f78
parent 170bde83ae90e03b7964edf2a00da6f83c406910
author Bart Sears <bsears@google.com> 1440638849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440638849 +0000

am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev

* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]