commit | f1f33c4eb2ded794c74285d8a036073ae5419f25 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 12:46:16 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 12:46:16 2010 -0700 |
tree | 027051d32d7d47cc99330c51a674042289b0a3d1 | |
parent | 766d1b7458e5dae1cca36b01cf13e4d16536a091 [diff] | |
parent | 6b9a1a5124321253a75a17027292080bf6a946e8 [diff] |
merge from open-source master Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1