tree baaed14fb58bda12af445c7efef7fa0f24630850
parent 7c24d433ed2175dfb9b75f3beeb4283aa21d94e6
parent 49e295750690ab11c178c368fbfcd24686962b3d
author Tom Taylor <tomtaylor@google.com> 1361555284 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361555284 -0800

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

* commit '49e295750690ab11c178c368fbfcd24686962b3d':
  Don't allow clients to update or insert _data column data