commit | 31e7033c12dd4a4549b7d52c226a2678cdc0b022 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 04 09:29:27 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 04 09:29:27 2010 -0700 |
tree | ed855078c90054b870b6effb1b1ea9f82f1fb200 | |
parent | fd9abb8086bf98d453d01cca95c54e93e46e17e7 [diff] | |
parent | 61aee0c84573170c545c14fc152c6b09715a63ab [diff] |
am e4b9834f: am 6de3a6fd: merge from open-source master