commit | 30cc76b4b5ca7c25fddb00461be958778a1d7cb8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:50:35 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 07:50:35 2010 -0700 |
tree | b94ba4b50aee7560200fa511da44940ed8c967f9 | |
parent | b510836a463fac557ddddb87638ecbb41660f2c4 [diff] | |
parent | 08a42a053fa9c8ed9e9c0143663ff2e65b1fa0a5 [diff] |
am 08a42a05: am 9867f949: merge from open-source master