| commit | 01208118b3ba5bfa3a79725bc4d15d3924ec1a5d | [log] [tgz] |
|---|---|---|
| author | Samuel Tan <samueltan@google.com> | Wed Jan 13 13:42:00 2016 -0800 |
| committer | Samuel Tan <samueltan@google.com> | Wed Jan 13 13:42:00 2016 -0800 |
| tree | 0fd00e48ffbe8fd8a1c9307caa81edb34782edcc | |
| parent | 3242734d05df634f57cdc751fc204268783686a6 [diff] | |
| parent | 3caecaec6082c59bc1605c86be692b2ae0f85ee1 [diff] |
resolve merge conflicts of 3caecaec60 to master. Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f