commit | 6be163b167e986b4fafda9290e5d74fc3945b273 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 08:00:52 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 08:00:52 2010 -0700 |
tree | d4d47b3a2ddacfb9da4dd026ceb23dd617abb13d | |
parent | 324a98f1901fb84ec4c88196e01c3e14c2b5a4a4 [diff] | |
parent | ad5431d2ca9c4dd454dfb3bc8e9de3ee0ad28a27 [diff] |
merge from open-source master Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc