tree 4de9629082662428c97f34727c365c26c3d76768
parent a76a336b6ac38d40ca41c5debef81a5f6692c4f9
parent 07e1b7c1025f2d7b275f8ad9d53b3d400033db49
author Shubham Ajmera <shubhamajmera@google.com> 1447755799 +0000
committer android-build-merger <android-build-merger@google.com> 1447755799 +0000

ByteBufferAsShortBuffer: Merged variants
am: 07e1b7c102  -s ours

* commit '07e1b7c1025f2d7b275f8ad9d53b3d400033db49':
  ByteBufferAsShortBuffer: Merged variants