commit | 6d4113f859c2c970712dc69594dcc5ecc7ffba26 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 22 14:21:21 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 22 14:21:21 2010 -0700 |
tree | e36abb3d25448088bd9e76b27c35deb66675d333 | |
parent | 1adbb607d2b6a74b7871a8cecd7c5690c8c5cf6d [diff] | |
parent | 424875b818811c04b472b28a9f5d3b6fbcbec219 [diff] |
merge from open-source master Change-Id: Ibc43e8da821400022726b119940708efb052908b