commit | 766d1b7458e5dae1cca36b01cf13e4d16536a091 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 12:44:20 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 18 12:44:20 2010 -0700 |
tree | d7ba82c118862c3de281c4aa4fa421d971d2c04b | |
parent | e5a023bfbbed6343f895652b51c0d4aa9ac0b8eb [diff] | |
parent | e429c5ec9d52a5e9af9133f5de9f1002f04aede1 [diff] |
merge from open-source master Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7