commit | 4dd72e10ee8728834c2eb90aa6f800fa80206f61 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:52:52 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:52:52 2010 -0700 |
tree | 028086af264a1d96a17a8623d823a1923ba12af9 | |
parent | 1e588cfedcf8689d70165313d199940dbb7c4a44 [diff] | |
parent | d181206cab26312f16b7f8089fd775791bd105f3 [diff] |
merge from open-source master Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38