commit | ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 09:36:55 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 09:36:55 2010 -0700 |
tree | f7da48d8a34c885a822148e9702a8bd0df868540 | |
parent | 2b544c9f0ea139d052664be0be465c2315707081 [diff] | |
parent | bcb62f099a8619c1045df54e33d43cde85af4036 [diff] |
merge from open-source master Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a