tree ee58d966aa47aa6537bc6a374f14dfe0ef161160
parent c5c99734cbbe68ab09a08c1b16f9ff66ff91ecf0
parent 712b05d00b00a6148852e153ef76dfb5960623e9
author Jason Sams <jsams@google.com> 1421961482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421961482 +0000

am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge: 081cda8

* commit '712b05d00b00a6148852e153ef76dfb5960623e9':
  Add FP16 types to the list of RenderScript types.