commit | 60faafcf01ff7f4179cdcaefd24b10ac4ee7f692 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 15:51:09 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 30 15:51:09 2010 -0700 |
tree | ad00e722405b9d2be48afa16fedd0f04433c9bee | |
parent | c78a9698dd55a165c2206c380f87f173bacba2aa [diff] | |
parent | 4fef81a5a97c3eaa8806d18366007d51eb9ea54a [diff] |
merge from open-source master Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a