| commit | a8b288d28588db5a850fede719c8cbfcf7b8966d | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Feb 08 16:33:58 2011 -0800 |
| committer | Gilles Debunne <debunne@google.com> | Tue Feb 08 16:33:58 2011 -0800 |
| tree | 12a552a7b5527f5337adab29948ca5123dfbece3 | |
| parent | a9bc4da260f306ac0b74f580663427c525c0e9a5 [diff] | |
| parent | 35dc5f703af3df838dfba24f05e0a0c84e689126 [diff] |
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986