| commit | 89fbcd72fbe6ef26ea2703f8e338fd198c958ecc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 17:45:45 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 17:45:45 2010 -0700 |
| tree | 6163a99deac8770a25b654a51f28306ac56747fd | |
| parent | 779d1778b6147ee1b57428af234d1498a26f031e [diff] | |
| parent | c28944743966b70ace7477ee50f6594f4723d2d3 [diff] |
resolved conflicts for merge of c2894474 to gingerbread-plus-aosp Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2