| commit | e01f9004a2f46671753a9540d3f27be1b2161ce8 | [log] [tgz] |
|---|---|---|
| author | Mindy Pereira <mindyp@google.com> | Thu Oct 21 10:47:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 10:47:15 2010 -0700 |
| tree | 54b76e53206c2793446cf8721ef56ae37919ca70 | |
| parent | 4e5effe0f11701ec37eeae043a446ed8f664073a [diff] | |
| parent | 2758ba9e700b202d03648a2fe431ecbb2b6053f0 [diff] |
am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5' * commit '62ad0db62393073a8cda9b21e4ae1506954c10a5': DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.