tree b49e6b652cf2083b02209b90a53fa569b82aff3d
parent e579edc76b6f3f8c977d96db6af01d73e6c93804
parent e766e399c59669156284c330ae3f38f79230d930
author Alex Klyubin <klyubin@google.com> 1448478309 +0000
committer android-build-merger <android-build-merger@google.com> 1448478309 +0000

Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
am: e766e399c5

* commit 'e766e399c59669156284c330ae3f38f79230d930':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).