commit | a8275f433b84371047ba2fcf889a63b2215f01b4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 21 11:21:34 2010 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jan 21 11:21:34 2010 -0800 |
tree | 6c2ceb8e459a560ae4ade294c2140d8d3ffeb111 | |
parent | b0aff24126f6a43d189b9f5ca2d8925fab7f40e8 [diff] | |
parent | 0ee14a7e31e909301981f7cc4d672ed1fe50b61f [diff] |
merge from open-source master