commit | 47bc4e3407326bc58bb171660af5ced4edb93608 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:28:20 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 09 14:28:20 2010 -0700 |
tree | f993107e6634e663236800616148964e4fc6fae1 | |
parent | fae32a91bcc0c0f397ea681a245d32e759718618 [diff] | |
parent | 90c47c4278b5425239d259b4079f051b9d979fd0 [diff] |
merge from open-source master Change-Id: Ia02a590164d87ae98c714ac7d408ff7f241ae1fa