commit | 5da46c90dbb04bed88bea9a468b41a4ffd1e4506 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 08:15:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 08:15:28 2010 -0700 |
tree | 1184940e086a665f41694fd076cbf26d86ff8204 | |
parent | a48c07008ec6fc949d0cdf771f89a01b6124638e [diff] | |
parent | a11a001fc63d3731c04e77cf9f4544dcc1e57849 [diff] |
am a11a001f: am 705b37b8: merge from open-source master