commit | c642e02f6b8e6327a4d979582d29a2e1eb9afafa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 22 13:36:46 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 22 13:36:46 2010 -0700 |
tree | 2316615a836500c1e7b629b83cdef86f5ee3cc23 | |
parent | 299d061c828fe8775fdafefd59f728041000bc79 [diff] | |
parent | a5786f8023065904b16512748078dbecf31926cb [diff] |
am 2b32afd0: am 5ebaf106: merge from open-source master