commit | 58f6c80ad83a3aea89492c89655e9701d48fbe8a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:24:06 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 09:24:06 2010 -0700 |
tree | 0be700abbe56ec5fbb9233672f2aec186eb3185d | |
parent | 8aff3602e7dda266efa2ed5a9da481aad4d0a331 [diff] | |
parent | d428e48aa1295519c49ace23905c2acf5a625ccc [diff] |
am d428e48a: merge from open-source master