| commit | 3d67c5688f4855acbfd6de103b278ceee74a4451 | [log] [tgz] |
|---|---|---|
| author | repo sync <chiachi@android.com> | Fri Sep 03 00:24:26 2010 +0800 |
| committer | repo sync <chiachi@android.com> | Fri Sep 03 00:24:26 2010 +0800 |
| tree | d48796ae0c461ce5160b8c948c290fbb2bef058e | |
| parent | f61f75eb0f0030f0aaee4621f83bb2bf579043fb [diff] | |
| parent | 12eaf9d50c2ed30a561eb433ad69a388e54c482d [diff] |
resolved conflicts for merge of 12eaf9d5 to master Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d