| commit | 1b7e3ef417f236c333c7528e7af5485fc4da664b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 12:15:35 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 12:15:35 2010 -0700 |
| tree | 6416e431f8b723833df2f6e796c1f806fb5d0954 | |
| parent | f41bc1200354b20aef91e5266035cf91069d69a5 [diff] | |
| parent | 55bef14f153c1a80006de2ff86bcf67984a6e1a8 [diff] |
am 55bef14f: am fb234bbe: merge from open-source master