tree f41574ab66b5eec556e0ff8b69b2a0a93fdc14a2
parent 22bdc370b057884b4594c20f9f4164f3bf06dc30
parent 8cd12112e444e01163526fe6ab237f6164b0018b
author Doug Zongker <dougz@android.com> 1370373462 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370373462 -0700

am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit '8cd12112e444e01163526fe6ab237f6164b0018b':
  Fix the potential segmentation fault