tree 6bff5daf9bb2b4ec3104944ebd9877c1150c885a
parent 043699341e850b721d9ce1a14b2c10add4378335
parent 27fb60619645eb440ae3aeb164cd7640ccb6c79d
author Gaurav Shah <gauravsh@google.com> 1446507247 +0000
committer android-build-merger <android-build-merger@google.com> 1446507247 +0000

Merge "Fix pointer arithmetic on a void*" am: 306b1d9d66
am: 27fb606196

* commit '27fb60619645eb440ae3aeb164cd7640ccb6c79d':
  Fix pointer arithmetic on a void*