tree 2f93ac7d6396d1684cc1dd42fc7e5139b9c8c28b
parent fb9f10f6934792f16ca6665f48c0aaee686d2e06
parent 5b8c69d95a5933268a1c6ded6cb9c13386c9cf10
author Marc Blank <mblank@google.com> 1267489107 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267489107 -0800

Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"