tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent a4240d6982da3bec80b19febf8c9b668be728c31
parent 216c0fd96d9038fd447d0bf8548187ed5ef9b952
author Michael Jurka <mikejurka@google.com> 1392410167 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410167 +0000

am 216c0fd9: am aa671a84: am 2fe1530c: Fix NPE

* commit '216c0fd96d9038fd447d0bf8548187ed5ef9b952':