tree c287032d0b89d4702ec35e69dc63a5f819e8f459
parent 117f161fee52dfa200f89282c487d58c29b41d4f
parent 081cda87e1ed7d1c0f30408dbc6635afc48d98a0
author Jason Sams <jsams@google.com> 1421961068 +0000
committer android-build-merger <android-build-merger@google.com> 1421961068 +0000

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

* commit '081cda87e1ed7d1c0f30408dbc6635afc48d98a0':
  Add FP16 types to the list of RenderScript types.