| commit | 5dffc6bb2ac918e7d101fd2f14cf0d4fdbd32e05 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Mon Jan 25 18:12:31 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 18:12:31 2010 -0800 |
| tree | daa4ac1e89ac6f4d13490072c16497b358a835f6 | |
| parent | 221cb2a6ca8a187fbe35f465df640a68ed2feaed [diff] | |
| parent | aeeb1a84aae2c7400b2edd90cea8306565225275 [diff] |
am aeeb1a84: (-s ours) am 8681df90: DO NOT MERGE Merge commit 'aeeb1a84aae2c7400b2edd90cea8306565225275' * commit 'aeeb1a84aae2c7400b2edd90cea8306565225275': DO NOT MERGE