| commit | 594c0868d42b11e21d77dbdafa571d582b99305a | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Mon Apr 20 14:08:43 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Mon Apr 20 14:08:43 2015 -0700 |
| tree | 046a1f2ecba2bd2f80cf3cf2bb51d12747c26d17 | |
| parent | 12753112f3e67c667c97078971d3538ef4fcdda7 [diff] | |
| parent | 6cb3732d82e6a2346c00219931d0f0a3c3257f44 [diff] |
resolved conflicts for merge of 6cb3732d to master Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f