tree e39cff01ebe59ef7c4e75d8f977b999ef1d16080
parent a4441ac9ccfffc89ee66e8fc9be2b363f7e29c92
parent efcd37e2d54f0f4d38fdc71cfab3460c1e0c507a
author Yorke Lee <yorkelee@google.com> 1378323760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378323760 -0700

am efcd37e2: Merge "Fix Dialer crash due to missing database columns" into klp-dev

* commit 'efcd37e2d54f0f4d38fdc71cfab3460c1e0c507a':
  Fix Dialer crash due to missing database columns