tree dfaefe5b42820567e63ac9ef7ebc52614e00ae18
parent 7c938d99a5e6a474bf40ef310d94c9582bc91787
parent 0f668f3c2be93ad9be221d868abb3d9a6e418f18
author Adam Cohen <adamcohen@google.com> 1410275273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410275273 +0000

am 0f668f3c: Prevent GNL from crashing on JB

* commit '0f668f3c2be93ad9be221d868abb3d9a6e418f18':
  Prevent GNL from crashing on JB