tree 0a84b252d55f8ed6799e320bc3af04a34bbd3046
parent 429cf07ee6feb08a6217a95f8400e81fbbe2c5f7
parent 828617b8277b346332dae15654ef6c28a9a2f422
author Tom Taylor <tomtaylor@google.com> 1371188183 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371188183 -0700

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

* commit '828617b8277b346332dae15654ef6c28a9a2f422':