| commit | b50cea0267763d271df14a55859c6f203eeff041 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczyński <gruszczy@google.com> | Wed Mar 05 17:54:58 2014 -0800 |
| committer | Filip Gruszczyński <gruszczy@google.com> | Wed Mar 05 17:56:40 2014 -0800 |
| tree | 12dc09b340a1f2be98d00457ede051ad1684dfe6 | |
| parent | cb20740ee171de3e604c07cdd02963d4d08a5fc9 [diff] | |
| parent | 1569d61f66431118666e51d55817193718d83206 [diff] |
resolved conflicts for merge of 1569d61f to master Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673