commit | bc4b4efefccaf7319ab4d02629757cc7d732a20b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:57:51 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 14:57:51 2010 -0700 |
tree | 75a8d59531c4c48d63d8408d74d09d9344ae8ef7 | |
parent | 32953d5b20651d3d3adc6dcfeee09f41cccd4edf [diff] | |
parent | ae5c954b68e3654eb2a64b8a9cbf3960e61cdbc9 [diff] |
am d6e24ca2: am 4adacd23: merge from open-source master