| commit | 43c424fd7eb6da3ab2c4554226e8269f319db842 | [log] [tgz] |
|---|---|---|
| author | Wei-Ta Chen <weita@google.com> | Thu Jan 13 12:38:43 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 13 12:38:43 2011 -0800 |
| tree | f2d04e139cc41a603f1f7726b846a0031e061409 | |
| parent | 3f396d7a86880aaf29fcce22a8204cf49e8d69d9 [diff] | |
| parent | 8c4d7a6dc81ba9c684212ebc9af3a8cc039b8c36 [diff] |
am 8c4d7a6d: (-s ours) am b4f070ed: Do not merge. * commit '8c4d7a6dc81ba9c684212ebc9af3a8cc039b8c36': Do not merge.