commit | aa8da3dc405dca80c6aff71a7c17f883edea2814 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:15:36 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 15:15:36 2010 -0700 |
tree | 6756be0a6d844ab2fd8afb3c8427012165f41896 | |
parent | 3e4fd9ea19c16050ef78ea55138a114798033f65 [diff] | |
parent | a8e0f75b7fe99dd6672bfc958734f4558905c3aa [diff] |
am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master