| commit | e53c10b1106a02d6cdbf8a8d5cb87073f554940a | [log] [tgz] |
|---|---|---|
| author | Roman Kalukiewicz <romkal@google.com> | Mon Nov 30 13:48:43 2015 -0800 |
| committer | Roman Kalukiewicz <romkal@google.com> | Mon Nov 30 13:48:43 2015 -0800 |
| tree | 58d431afb455f8a1200051f2b8034c2d8921c6f9 | |
| parent | 5329bc5213efe8f24fbf46c53ead8530c2b0fb88 [diff] | |
| parent | d4760e8381dd266297180dca5910619ff6dbc232 [diff] |
resolve merge conflicts of d4760e8381 to master. Change-Id: Ib4d64b3a9b80ad59508e9bcf137df2b6db9d63be