commit | afe86d745a4c55bf9bc858696dc187039f2016f7 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 15:39:55 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 15:39:55 2010 -0700 |
tree | 9527b8ae7e61d2952981a885f41e4b92b86c7046 | |
parent | 702b01c21194ca8cf01572dd4b6eecb4d3e3af46 [diff] | |
parent | f450fa5f991af3c0814f96265cb3b2aafdce2309 [diff] |
am f450fa5f: merge from open-source master