| commit | 1aecbcb23d6304b1c86bd7ee8f6c5352d8d356cc | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Oct 02 18:04:23 2012 -0700 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Tue Oct 02 18:04:23 2012 -0700 |
| tree | bf5ed7292492938e9697c0cc2c451cabcdc7c354 | |
| parent | fb5208ef20b4b0082edc541850202b841a0584e6 [diff] | |
| parent | 9bf263b25143939e69c37cadba36083483681994 [diff] |
resolved conflicts for merge of 9bf263b2 to master Change-Id: I28da6f16a1d044864c81d5f1dcf6543169c09460