| commit | 7499a1ca68ba115efcf53f6a06520c579c44364d | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sun Oct 10 16:50:28 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Sun Oct 10 16:50:28 2010 -0700 |
| tree | 751e28dbc292c2d46217c5a16f3942bf1495af79 | |
| parent | 329430a54e152ad1f5e0003194728988661788bb [diff] | |
| parent | 5d1465490c1b2c18b5425cfc14b405f45b61e281 [diff] |
resolved conflicts for merge of 5d146549 to master Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b