commit | 875dfa2ba28db2d243e44722c69009377377e5b2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 05 18:16:44 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 18:16:44 2010 -0700 |
tree | 34b6c7943b9c255bcae6e0a6353456dc792e58e2 | |
parent | d3152fd4527e0f98be96ae63fd32efeee68b761a [diff] | |
parent | dad488c3f744044820cff075520de45134d39b40 [diff] |
am dad488c3: merge from open-source master