tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 32e2ff45a3e1daecbee9d04eb77c28b04e14ef86
parent 33dc3f2f35a330f0c7dd688225c114b567a56ca1
author Adam Cohen <adamcohen@google.com> 1422669716 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669716 +0000

am 33dc3f2f: am b6711ac0: am 0f668f3c: Prevent GNL from crashing on JB

* commit '33dc3f2f35a330f0c7dd688225c114b567a56ca1':