tree 7fa17a41ad718dd575b68a7a3698032d6bc16002
parent 1e96d49a7d4d1af8f3bd6630e4ec9369813f18e7
parent df7436e709035fb6f5667980042848c8b4ca3e79
author Elliott Hughes <enh@google.com> 1378242548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378242548 -0700

am df7436e7: Merge "Avoid segfaults if properties are not initialized"

* commit 'df7436e709035fb6f5667980042848c8b4ca3e79':
  Avoid segfaults if properties are not initialized