tree 2092b353aeafff2be08f433da51ef66fe420c4b6
parent e14002b30b4978d7c684a12d439379218250585e
parent 66d079bf25ff3f99dbba91e02d392c936238170b
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.