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