commit | 8ecdf610ca2652ef7941e6ab153602026f4b8e8a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 14:32:53 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 31 14:32:53 2010 -0700 |
tree | f25acb52f7f1052a1abde039e7dd522111294768 | |
parent | 519a73f11e243f4b16afa06238c4e3478bd4b4b5 [diff] | |
parent | 5ffedb22c856ae5731324b43832ab3f5309683f2 [diff] |
am 5ffedb22: merge from open-source master