| commit | 3463d0e1026263d9d740c3324138a346b0c9006d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 14 16:11:06 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 14 16:12:23 2010 -0800 |
| tree | 286a4a4a32c34e16b09c2df531bd855557b7f084 | |
| parent | efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700 [diff] | |
| parent | c1b330818e06cf5a3dc8d342e941eba5bce0929a [diff] |
resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221