| commit | 8bf05f474201f1d545be179da08f4fdee0f50374 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 15:22:06 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 15:22:06 2010 -0700 |
| tree | 44d46ad4fdd1e37ce328106a37cc2bf40628e2a6 | |
| parent | 00f88a950b992d34557ef0445b6e0590cb8847c4 [diff] | |
| parent | fe953c4381f1b0f523ece55753a442eb8665d669 [diff] |
resolved conflicts for merge of fe953c43 to master Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68