| commit | cffbb9ec83957c0c7fdaf27bcc11e324eb2b2a2d | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jan 12 20:32:17 2016 -0800 |
| committer | Ying Wang <wangying@google.com> | Tue Jan 12 20:42:47 2016 -0800 |
| tree | 46dc17f29f1dfe09e489e9419997671545d1623d | |
| parent | 02685cbf3e54751000270b430934ebece3eeaffa [diff] | |
| parent | e7c98642e1e156ea6cde1238cd0006f669cfb696 [diff] |
resolve merge conflicts of e7c98642e1 to master. Change-Id: I2c5ea4dd04c3a3048889d1fea07101f6405ae2b3