commit | e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:34:52 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:34:52 2010 -0700 |
tree | 4dc315edc7a821d505d29f4be274c6e2a367f466 | |
parent | 47bc4e3407326bc58bb171660af5ced4edb93608 [diff] | |
parent | df49c50c52d8f772f21d11e97c053ed63360e0ff [diff] |
merge from open-source master Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19