commit | 7b1a2079227cd93d1d92088fed0df2351705cbe4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 12 15:35:31 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 12 15:35:31 2010 -0700 |
tree | 72e489286f1c227e1599f65968f4dbc002466c45 | |
parent | f079a659774473324b5739652c014229189a10ff [diff] | |
parent | 25940667870e782c1d84ed7f6e4e87d92c14c6cb [diff] |
merge from open-source master Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e