commit | cefd298d8abae87a70a987530b5a375179d1ab11 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 16:13:29 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 16:13:29 2010 -0700 |
tree | e678a6c220145c0379262e9f4cacd6071940f0d2 | |
parent | 07c5e16d883ad43314ff6da9b31eac05087973c0 [diff] | |
parent | bc2f9318608e07992b7542172c780cdecfaf22c9 [diff] |
am bc2f9318: am 57b44e52: am bc12cd04: merge from open-source master