commit | 9167ba50e4d7e08e02119d9c4a0f0392296cc3f1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 09:11:31 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 09:11:31 2010 -0700 |
tree | 3798d0dac82caf45935a6e03a8a5948e7d9c6108 | |
parent | d48e0382c3db1827ccb79fe912d271d426dd46ad [diff] | |
parent | 1b44ebda7062e204993e930cf073130ce8799f62 [diff] |
merge from open-source master Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226