commit | fc7eccf5fd52a581b750f225d8eee5ac92490ab4 | [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 | 12283462dbf86ce6f21d9a4d5e7757639be0e371 | |
parent | 0056e5eff539d92b90223b20c899dd4b656c49d7 [diff] | |
parent | e4582835f0732a24dd14324e895d373d598d7fe0 [diff] |
am 55bef14f: am fb234bbe: merge from open-source master