commit | b510836a463fac557ddddb87638ecbb41660f2c4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:49:09 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 07:49:09 2010 -0700 |
tree | 8cf7b53dd434d8b308ea520375ae0f5f5d2516c3 | |
parent | fd24e94ac2d5d765447bb0138ddea35cb55354ff [diff] | |
parent | 4912afb1a54aa0ba7f5b53dfa3b367dafbaa299d [diff] |
am 4912afb1: am 2d75ee4a: merge from open-source master