| commit | 84acbc81b50e8d30df668b4ffd763b7c96e172a2 | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Tue Jul 23 07:31:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 07:31:26 2013 -0700 |
| tree | a45d0bb89781a9c7e01fc0f929b19a0c9031d2d1 | |
| parent | f31ad231bb1c7b67be7ae7953509e467d03e00ab [diff] | |
| parent | e2688b18df75eceb4895fecaaf4f0ebd42f23ef7 [diff] |
am e2688b18: am 44c3d51b: am 13d744f2: am 466d8411: am 8d54a6e0: resolved conflicts for merge of b8fb609b to jb-mr1-dev * commit 'e2688b18df75eceb4895fecaaf4f0ebd42f23ef7': Do not allow updates to the _data column.