tree faed561c43a17a3a5fc0f2ff603cdf6de74a542f
parent a68120512c3930e30912379385a11502931dfcaf
parent 04311337ec83020caf58747d680eaccee3ab9b99
author Tom Taylor <tomtaylor@google.com> 1371188087 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371188087 -0700

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

* commit '04311337ec83020caf58747d680eaccee3ab9b99':