| commit | 6b762aaa8d24e9dcd91c69eaced417f688894add | [log] [tgz] |
|---|---|---|
| author | Chia-chi Yeh <chiachi@android.com> | Thu Sep 23 14:59:58 2010 +0800 |
| committer | Chia-chi Yeh <chiachi@android.com> | Thu Sep 23 14:59:58 2010 +0800 |
| tree | bd03149341b325a8c419b5d2abacc931ece184ce | |
| parent | a23cdda0a5fad7798454ecb05a7855cb9211ea22 [diff] | |
| parent | 2b6528554e4cbcdea1c294647ec9ec9ad41438d7 [diff] |
resolved conflicts for merge of 2b652855 to master Change-Id: I3604c95530823605d66cb56be7a37c55399a9271