commit | e475488b1159a7cb7d8829f16818d4b6b5a368c1 | [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 | 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 | |
parent | 076c8394fa028d61192dbcdeb3efed9db6cd8e25 [diff] | |
parent | ec39747a769180da9be4e71b597fb538bcc9b800 [diff] |
merge from open-source master Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df