commit | 47598d51b13523ec43f08542a7f0c5539a3fdffd | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 16:02:45 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 30 16:02:45 2010 -0700 |
tree | bb39ba42acd1d5e16c3120a89b1de216d65c0950 | |
parent | 364703c6fa4aa1a7d2ef5b0c048ea2a0d57a4c40 [diff] | |
parent | c511d4f84cd2f71df610286e9373ca0fe38b1353 [diff] |
am c511d4f8: merge from open-source master Merge commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353' * commit 'c511d4f84cd2f71df610286e9373ca0fe38b1353':