| commit | 4fa6e4ece09a3fe29d832d194ca9dac32f35faa9 | [log] [tgz] |
|---|---|---|
| author | Dimitry Ivanov <dimitry@google.com> | Fri Dec 11 14:13:16 2015 -0800 |
| committer | Dimitry Ivanov <dimitry@google.com> | Fri Dec 11 14:13:16 2015 -0800 |
| tree | 148e0a702bbcc8a8fdfe572ca2a5e022b100e38d | |
| parent | b1dfc87c3d029ed1d696286366a27a1b607db1b8 [diff] | |
| parent | b2c44a5ba6177413dd20d7d469ceaa94aa02672c [diff] |
resolve merge conflicts of b2c44a5ba6 to master. Change-Id: I6eb0f9a9a8d999c3179202b2880f179d3a442e2c