| commit | 164a0964a4a6e8f8a3e3008833364f009cd32398 | [log] [tgz] |
|---|---|---|
| author | Guru Nagarajan <gurunagarajan@google.com> | Thu Oct 04 17:17:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 17:17:31 2012 -0700 |
| tree | ba17325db2bedc9ff45fb38ec172989f56b134ff | |
| parent | ee5a6700f346314ce68b7892b80c7c6aebf46253 [diff] | |
| parent | 78a548070ec9144f527d23542a0048ae42f2ce85 [diff] |
am 78a54807: am 767ee659: (-s ours) am 7093537c: DO NOT MERGE * commit '78a548070ec9144f527d23542a0048ae42f2ce85': DO NOT MERGE