tree bbfc812f29694f2859ef43bb07bf9be5f0918f06
parent f4a3c1e07ae10fabf174da0904d2d0c3c2550bdb
author Elliott Hughes <enh@google.com> 1363892891 -0700
committer Brian Carlstrom <bdc@google.com> 1368143074 -0700

Manually merge JniConstants changes from 81fd7cc0.

(cherry picked from commit 40f73e04d8c37b456224908ad7b57210cba933c2)

Change-Id: I34de4bafbe648a7f3c467028c887c418402c7917