| commit | 2577f413fac56e698a091d6b8cc1ae3380804f36 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 31 13:13:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 31 13:13:06 2010 -0700 |
| tree | 002f4fdcff3be08c7a480d7a604e9f9d4fca84f3 | |
| parent | c111863fbf2d8b4ccf0b3d82864165dadc4a6f11 [diff] | |
| parent | 97b06ef7ddf66dae500e94b55d943cad61d28ae7 [diff] |
am 97b06ef7: Merge (ignore) from open-source master tree Merge commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7' * commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7':