tree 4b5cbfeed4595960592334708e1b1f9af5e80e94
parent a6d846afeaa67a503d189bcbc455b31ebe7a15b6
parent 7bb5745b970a760de11e71dc06f18ef77e5f4783
author Stephen Hines <srhines@google.com> 1347590756 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347590756 -0700

Merge "Failing uchar4->int4 test" into jb-mr1-dev