| commit | 55f0c1fa24ffe5540f2756e2697feac7fbbbc357 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:57:51 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:57:51 2010 -0800 |
| tree | 1dc31e39fbe875c4e05888b219aad32f9958e1ff | |
| parent | 0771ba9cf23f19c9662407fdd6a12845db225565 [diff] | |
| parent | 76c29e633fd924e0f98f34768999abb991753394 [diff] |
am 76c29e63: (-s ours) am f167c4bf: DO NOT MERGE Merge commit '76c29e633fd924e0f98f34768999abb991753394' * commit '76c29e633fd924e0f98f34768999abb991753394': DO NOT MERGE