| commit | b484648b6a0aa2bc5c81c99a13c97f2301673b30 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Oct 13 12:05:59 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 12:05:59 2009 -0700 |
| tree | 653ef7121e91eb96ad983781ef91e58dc47f173f | |
| parent | ae32322dbe10204a6ad09f4966b73934a162f867 [diff] | |
| parent | d0a513d17cc4132159591895e969da78a6c4e99a [diff] |
am d0a513d1: (-s ours) am 6fc4b1f1: am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms Merge commit 'd0a513d17cc4132159591895e969da78a6c4e99a' * commit 'd0a513d17cc4132159591895e969da78a6c4e99a':