tree cba62d0d64153aa2169651696bc238591341d679
parent 64e2e14d3de997330652139d600888c3357f3028
parent 48a44c0041a05e5142e2a3b22cdb4d9783023c7e
author Adam Cohen <adamcohen@google.com> 1414085476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085476 +0000

am 48a44c00: am b46426e3: am cb0468fa: am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf

* commit '48a44c0041a05e5142e2a3b22cdb4d9783023c7e':