commit | 0a0c57f929be1e37ccf32d27b5b7123684d0f0d7 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 13:00:37 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 13:00:37 2010 -0700 |
tree | 01777eb0d50d2324e7a7e69a348b56f2c6649d6f | |
parent | bcc112b16a07da8ad7a7d9c5cacf01a6e28544d2 [diff] | |
parent | 7c035d8a65626b8fed6e7da46477137ab9d5573e [diff] |
am 7c035d8a: am 2d743fe2: merge from open-source master