tree d836f250c7bcff407248f1cf055f11caa77be8f9
parent 86547a137713570c1d97de18c503d6cd32d725dc
parent 382df4f18340f5f40a83eb3d6b05f1e2e831e71c
author John Grossman <johngro@google.com> 1345506493 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345506493 -0700

Merge "Replace a segfault with a warning." into jb-mr1-dev