| commit | 98e8bd835e70d3b862d22a4e9fab3b499cf81524 | [log] [tgz] |
|---|---|---|
| author | Marc Blank <mblank@google.com> | Wed May 25 21:28:17 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 21:28:17 2011 -0700 |
| tree | d8d9030dc23c03a29382baf364afff8f9513a2a5 | |
| parent | e0f2fe59805655f68a899472bfc10159d9d4fa5f [diff] | |
| parent | f052c887d4bbfddbed548c2927788fc2ff697700 [diff] |
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