commit | acb25a1d9a8eb20efff33e39254214d7798ab9c8 | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Jan 12 14:39:42 2016 -0800 |
committer | Pavel Zhamaitsiak <pavelz@google.com> | Tue Jan 12 14:39:42 2016 -0800 |
tree | eb2cee97d3ffc114f31cc968beae2d3bc94f452f | |
parent | a539a57002dfb6cf746ed6aec665912739f91173 [diff] | |
parent | 5a1e5edeb74e67861e4a34f55f5383b918e336d9 [diff] |
resolve merge conflicts of 5a1e5edeb7 to master. Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d