| commit | f35012b0930fd2f5e1b67929b6f0abf636fc4f20 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 08:16:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 08:16:57 2010 -0700 |
| tree | 1184940e086a665f41694fd076cbf26d86ff8204 | |
| parent | 5da46c90dbb04bed88bea9a468b41a4ffd1e4506 [diff] | |
| parent | 7e81a617720a9411af205378d3a8b02ebb2155e5 [diff] |
am 7e81a617: am c57a22c8: merge from open-source master