commit | f601ce2c1455cbfee3289309d20e55172df71bf6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 02 07:38:30 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 02 07:38:30 2010 -0700 |
tree | 880eb6e83e11c2d0b819271ea5446253b0f603e7 | |
parent | 1cbf9482d7d32bac60741d6e512f3ac921f3a6aa [diff] | |
parent | 61af57bfc370ac0bbdf8a262afadf2f60a5bbded [diff] |
merge from open-source master Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6