tree de2e0910f5018f7be08c8fb6cfed3d5842153ea8
parent 9c842fcf486ed5c70ca6db3106349aade27751bf
parent 466d84110ef8f03b91561dd7a778558570e32abb
author Chiao Cheng <chiaocheng@google.com> 1374589104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374589104 -0700

am 466d8411: am 8d54a6e0: resolved conflicts for merge of b8fb609b to jb-mr1-dev

* commit '466d84110ef8f03b91561dd7a778558570e32abb':
  Do not allow updates to the _data column.