commit | a8e0f75b7fe99dd6672bfc958734f4558905c3aa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 15:14:04 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 15:14:04 2010 -0700 |
tree | 220d07ff6bd81691db9f8089e2f44c520845d9b5 | |
parent | b73179c7c01edc21876777d95b7a08692d48e11c [diff] | |
parent | 7450c02a35d7c1f8580f906d6f1c1a11bc5c4fd0 [diff] |
am 7450c02a: am 900b6157: merge from open-source master