commit | f7e148c1bc482fe7f8df49d216b1f9390f0638b9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 03 09:09:17 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 03 09:09:17 2010 -0700 |
tree | 55ff3f02de956286e17862c8bbbf6525640283d5 | |
parent | b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163 [diff] | |
parent | cbbe79add1410b53ec65936cfb1b74cac68467f0 [diff] |
merge from open-source master Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea