| commit | 74e5fe5909e867bc65b69b26a97efbcc73c0f50a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 31 15:01:25 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 31 15:01:25 2011 -0800 |
| tree | 7bf019420eaf4b5e41aa5ff5e0a546d6fafdec14 | |
| parent | 4a702faf5b2a871ae7766e8472ebe737c4624683 [diff] | |
| parent | 5131763c58be3ac78a28532261cdc8fc3af010ef [diff] |
am 5131763c: am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs" * commit '5131763c58be3ac78a28532261cdc8fc3af010ef': stubs