tree c149844bce7f2e4fb4714cd4bf7a27f0a7d44064
parent a8b832a89713dea6d1a82cfc8ecfa624c4fc5783
parent 9367f4f973e0d4dfb1fe898709f0246dce6f81aa
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