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