commit | ac65d2f600a829ca6bf0385352c1900fcc4d0698 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:43:56 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:43:56 2010 -0700 |
tree | bfe284782604ae2360d63df9c36247f26e0192f5 | |
parent | 1e5db2794b72cad45ca65db9065c6ae495a0204f [diff] | |
parent | fdf2454db21284b5e1ec23cb18724388c85fd975 [diff] |
am fdf2454d: merge from open-source master