commit | 658b7a5a1a4ac37713371ab13ad9fffe8ae7806f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:56:41 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:56:41 2010 -0700 |
tree | 488614969774764bf493787aec65b91cd0153967 | |
parent | cb0bdf19f51a5ed18c0a3333e7c77d785ba87211 [diff] | |
parent | 12b6f6eaee7e92b80d04eb3b6387a08454007b8d [diff] |
am 12b6f6ea: am 55b7d124: merge from open-source master