tree c028bfe537607823c37e2ffc8c713c73059d3130
parent f644b1c5f92cb67b8ff007eaa03f732e99691c8c
parent d760d92dbf3ba36ddcccc3630f31ce49b6cdfd5c
author Adam Cohen <adamcohen@google.com> 1422685342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685342 +0000

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

* commit 'd760d92dbf3ba36ddcccc3630f31ce49b6cdfd5c':