tree 203c8354929040af8453877c036a5f72a33d0f08
parent dd5e16ccb3a6226ac4b6b34d98d97683bb543314
parent cad5d8e34b02e397eeb508cd4015c3b207fbb7c5
author Tom Taylor <tomtaylor@google.com> 1371185825 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371185825 -0700

am cad5d8e3: am c72280d2: am 49e29575: am 21cf95e7: Don\'t allow clients to update or insert _data column data

* commit 'cad5d8e34b02e397eeb508cd4015c3b207fbb7c5':