| commit | 466d84110ef8f03b91561dd7a778558570e32abb | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Tue Jul 23 07:16:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 23 07:16:14 2013 -0700 |
| tree | 17ebea45f7bbe0afa08c18d98a4673e4cf59b5d1 | |
| parent | 1f1704387e7f4b4997797ee575dc4a44b7ae7853 [diff] | |
| parent | 8d54a6e0fa9fb4bb0a2b3b2f36d0e9bf930d05c8 [diff] |
am 8d54a6e0: resolved conflicts for merge of b8fb609b to jb-mr1-dev * commit '8d54a6e0fa9fb4bb0a2b3b2f36d0e9bf930d05c8': Do not allow updates to the _data column.