commit | 24d9c149c831f9793002af67f9e5436e415dfbea | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:16:50 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 14:16:50 2010 -0700 |
tree | adab404254254447812591f0e8de705fe09a3093 | |
parent | 38e6aa365e4f209099bf665b7c50e0cd29513051 [diff] | |
parent | fc97669ad5c11a9b4ec88db9a592a16387092ec9 [diff] |
am fc97669a: am 72a6af1a: am 7d952644: merge from open-source master