| commit | 7bfe667f0404ad8801c0f0b8427f18b1c110f0f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 21 09:02:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 21 09:02:31 2013 -0700 |
| tree | 62b7e9d897ad22f8f6898174604afbee96fe0b5f | |
| parent | a5ff1613ecaad3b43ebc300f8c34f4312397cb36 [diff] | |
| parent | 152446156e75ab526c1c3adbfe3668546176c663 [diff] |
am 15244615: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '152446156e75ab526c1c3adbfe3668546176c663': short-term fix for flaky CTS tests that need focus