commit | 7cd6ca9ba8eb9929189e59a0f8f31b05aa8dffe1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:57:51 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 14:57:51 2010 -0700 |
tree | f97eb1d9a5b87097062726c20fe204b862a46b07 | |
parent | d6effb069656add955790a85eaeb556e724dfc7e [diff] | |
parent | d6e24ca28b0b6384fd9b3117713402a1f43fdef8 [diff] |
am d6e24ca2: am 4adacd23: merge from open-source master