| commit | bb59a9f428334f7345624e5f4eb66a6aad8dc5ce | [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 | e6d3150bfada44fbf201b3cc7e356a69582fcf0c | |
| parent | d6154db472459e436693f6d227f64f1da059e8cb [diff] | |
| parent | f479aa0900e9a85afdc78b1048684e37579ebf23 [diff] |
Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23' Conflicts: api/current.xml core/res/res/values/public.xml