OSDN Git Service

Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5
authorAlex Klyubin <klyubin@google.com>
Wed, 25 Nov 2015 19:13:21 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Nov 2015 19:13:21 +0000 (19:13 +0000)
commit0540e1b127e03ecc97c32719ac79769d69c16aec
tree1842c112796d45ca35c62b9eb7b0e38d021457fc
parentb159adb4a89de42156537294b39d163c26d04d88
parent4bc1904119875dd0e8c63f87106e8ab293cc9a7a
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5
am: 4bc1904119

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