tree cba62d0d64153aa2169651696bc238591341d679
parent c27bb3ab307d4028e9799ee903c1e4e253586993
parent 46ee143121e70721a082f656eb75ff0d819f0084
author Michael Jurka <mikejurka@google.com> 1414085258 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085258 +0000

am 46ee1431: am 933705a6: am 216c0fd9: am aa671a84: am 2fe1530c: Fix NPE

* commit '46ee143121e70721a082f656eb75ff0d819f0084':