| commit | db0b5690153fe88d37aa6324a7d406f2f9eec0d4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 09:57:11 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 09:57:11 2010 -0700 |
| tree | 5db2f7cfde1f2089f0b38ff5920aacd2e21f45d3 | |
| parent | 14d60ba05068b266c7deb915c370227caa338203 [diff] | |
| parent | 3598d4baa6aae97ef3a4f42dc6e04e3346e4d0ca [diff] |
am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master