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