am 265f0d9d: am 6ee97e74: Merge "Fix a null dereference."

* commit '265f0d9dffb8b3d91c83991067abcd9684f2d712':
This commit is contained in:
Dan Albert 2014-10-27 04:18:12 +00:00 committed by Android Git Automerger
commit 412a9252ee

Diff Content Not Available