commit | f2ec642acd83f37fdabc94a7f1a886d036c9a221 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 07 11:01:17 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 07 11:01:25 2010 -0700 |
tree | 1cb9d9e3692e8c3ba2d8ab955b3fd9b69ece0add | |
parent | cf9e9723051d71a26632f9b81d316f960ae7ffa7 [diff] | |
parent | 92f98e0830dbb5a556851473ba8f6aa2060a391e [diff] |
merge from open-source master Change-Id: Ie7b46de270df88e7dbf9eb92a45e1ff7a315b1d0