commit | cc60f1b869efd1c37941d967e6f4d48eb317cf2b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 14 09:31:39 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 14 09:31:39 2010 -0700 |
tree | e06eea8c0dce2e9ee1f705dc4754183f4633e42d | |
parent | 10afb188203e6599e3f18b78e94885adc3b1eb47 [diff] | |
parent | aa1792548aae618944039cd7aa6058c2a1ad781c [diff] |
merge from open-source master Change-Id: I6d060597c1dffd56aacc0072104464ad651ef877