commit | 7ad843d66d3ebb9250f00e836f0e8e9502d7287b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:32:53 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 07 16:32:53 2010 -0700 |
tree | 0cb1715de919f10f94f82f02aa17ab7a9f1b2185 | |
parent | a78b025a18ed6083e5f556526e7b859d83696ac8 [diff] | |
parent | 47633f86279bc1854660d95a0b02bfa5ff14ad04 [diff] |
merge from open-source master Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df