| commit | 2b9ddad3255d79cc9d5b1e8bfc70a6f88b9c1fc4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 20 22:41:10 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 20 22:41:10 2009 -0700 |
| tree | da6084f542177972cf72a985b5d2c10330f87de3 | |
| parent | 89fe6cee915a25427a51290fa300e7b8e2c95dab [diff] | |
| parent | e6af9624ea5aef381c14b4fb7e7c92a11ad64bb7 [diff] |
Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23' Conflicts: api/current.xml core/res/res/values/public.xml