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

* commit '412a9252ee457bb2871859968eee9e3f341ac1db':
This commit is contained in:
Dan Albert 2014-10-27 04:32:58 +00:00 committed by Android Git Automerger
commit 394896b67b

Diff Content Not Available