tree c7223f8e8a1256dc0e3c27665138cd3c0d740c54
parent da1ebaef0aa8e38db6edf8bfc3d96290461a424f
parent d51bfc9b1fe89321af3c629e7b23a747050332e1
author Doug Zongker <dougz@android.com> 1370373028 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370373028 -0700

am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
  Fix the potential segmentation fault