commit | ca5c598d4ac7b2cc29516e1b06d630f4732e9c5b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 16:37:03 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 16:37:03 2010 -0700 |
tree | b1e9baafbed84193d87558427491b900f5a2b341 | |
parent | 2d9d245321e9003a77223307b0c4f9f883d51ad1 [diff] | |
parent | 1ae9ab3a01e959a4794943a75c4eec6d133ab7f4 [diff] |
am 1ae9ab3a: am 74df3dc9: merge from open-source master