commit | 7cc7433f4a71fcc9c1a3ece3669588c9318e2619 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 14:40:08 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 31 14:40:08 2010 -0700 |
tree | 49d3efa35e9473b0150046fed837791ae0c70d81 | |
parent | 717cd61a1ba99b58934b3b9f6c9e4a45949edc09 [diff] | |
parent | 1d168621a524e3937cd4e2a1cdec18a230b89a35 [diff] |
am 1d168621: merge from open-source master