commit | 381b55863efcd65ed43d66924beae550c18d8930 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 15:25:07 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 15:25:07 2010 -0700 |
tree | aa2378c7cbfe476f08fe4bd5a714474156de1b99 | |
parent | cdcc6a0061756d9d1e9a6e3801981a66dd152de2 [diff] | |
parent | 7cd6ca9ba8eb9929189e59a0f8f31b05aa8dffe1 [diff] |
am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master