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