| commit | 8156369570c0fba75c5541d40fb06f85b70b33b1 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Fri May 13 16:03:36 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 13 16:03:36 2011 -0700 |
| tree | 537fb76a51d7be08e730837ea581d9db40ac5ee9 | |
| parent | 3c879634167bf91fa370c19983f9b4853837c3ce [diff] | |
| parent | 328acffd8b2ba73693da76ce85581661db45c5aa [diff] |
am 328acffd: (-s ours) am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE * commit '328acffd8b2ba73693da76ce85581661db45c5aa': DO NOT MERGE