tree 8d1163d234b20c7120088788e34592483c40e919
parent c097209f919123558857ad1a10de90e43ee24d6a
parent 94931bd87e27e766167cf005788b148af49f6ac2
author John Reck <jreck@google.com> 1475518009 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475518011 +0000

Merge "Matrix JNI update"