tree d8d9030dc23c03a29382baf364afff8f9513a2a5
parent e0f2fe59805655f68a899472bfc10159d9d4fa5f
parent f052c887d4bbfddbed548c2927788fc2ff697700
author Marc Blank <mblank@google.com> 1306384097 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306384097 -0700

am f052c887: (-s ours) Merge "DO NOT MERGE: Add safety net to prevent sync stoppage" into honeycomb-mr2

* commit 'f052c887d4bbfddbed548c2927788fc2ff697700':
  DO NOT MERGE: Add safety net to prevent sync stoppage