commit | 7b84e72cc4609e04afdd7cc9a337be99444f74a9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 08:26:49 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 08:26:49 2010 -0700 |
tree | d55b617ab3879ec290b757f6f0752c2c03f3030d | |
parent | 6d1b47b505bcace0890fd359c57283420495c3ff [diff] | |
parent | 0659dd5625cb6abf09ac756eab92923b1002138a [diff] |
am 0659dd56: am c8c8c050: merge from open-source master