tree 64c45ee8a17e8d5b38002bcc75f2a332d312020b
parent 7006ac7820bb85ff928c6c5590e828a71840dfec
parent 4a2c079a76cb7d2e5f0b8126bcee6899665079f6
author Jeff Sharkey <jsharkey@android.com> 1383073304 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383073304 -0700

am 66d079bf: am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev

* commit '66d079bf25ff3f99dbba91e02d392c936238170b':
  Guard against missing document columns.