]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Merge branch 'jni'
authorYueh-Hsuan Chiang <yhchiang@fb.com>
Fri, 4 Apr 2014 19:52:40 +0000 (12:52 -0700)
committerYueh-Hsuan Chiang <yhchiang@fb.com>
Fri, 4 Apr 2014 19:52:40 +0000 (12:52 -0700)

Trivial merge