tree 20e0b8c930d0eb3097e8592f56b833dc82dd9e51
parent 0d46c7ab02eb97d6b4b2e26b9202fd9b4e9dd8c8
parent 1b7d9b736888096db9907031c5c9307cf4989a51
author Tao Bao <tbao@google.com> 1439309504 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1439309504 +0000

Merge "Fix potential crash"