commit | 34b1c11689f1a45899f5157f26f7466aa88e01f2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 08:43:14 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 08:43:14 2010 -0700 |
tree | ac66b96c1f6fc723c1244ec10353bb3dc9614560 | |
parent | 56d4bcd85cbe7092dd26b03ecea413d4ccefff18 [diff] | |
parent | b39b0f32d1c24e326886d8d27c8ad7dde38e28d0 [diff] |
am b39b0f32: am faf9a783: merge from open-source master