| commit | a77f7fdd912c0fd3145fe9087a12c4c8325f6d9c | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Wed Jan 12 18:55:27 2011 -0800 |
| committer | repo sync <enh@google.com> | Wed Jan 12 18:55:27 2011 -0800 |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | 2c4562dab0f2e2c3600e24caefd01943d9bc4741 [diff] | |
| parent | bf1d974f90f94d13c2ffece5b6bdfbf5d946c2c0 [diff] |
resolved conflicts for merge of 4f7abf2a to honeycomb-plus-aosp Change-Id: Ieaf43d93b158ab143601b874c872570c3c3fe98b