tree d6e4b61c2d1870cb36272518d803c1a054cd77e1
parent 5ba732ea7db0d13376160f54fed3b0ee0b64422e
parent f85f2e5a77a578fc14bf95fa05025add350e7f9e
author Marco Nelissen <marcone@google.com> 1445027556 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445027556 +0000

Merge "fix CLIP_S16" into mnc-dr-dev