commit | 5b4766d4a2082b019f144c88e4d697f81cd831fe | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 09:51:39 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 09:51:39 2010 -0700 |
tree | 1b410be729103c8acfb9a6a63fc925b5209d9915 | |
parent | 8dcf7716c0795bed3d63f413501d5b918c2eb415 [diff] | |
parent | 08d3110279ccacb0103273b496c87d74c0f3a385 [diff] |
am 08d31102: am 99096976: merge from open-source master