| commit | 89add11bb4c4a3cae38d84d1151e60617efb26a5 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Dec 11 14:47:40 2015 -0800 |
| committer | John Reck <jreck@google.com> | Fri Dec 11 14:47:40 2015 -0800 |
| tree | f1a69a4a6045da8c224ecc5abec7d3c60a84caba | |
| parent | 5f519e77a5f240fac2785e2d3f1c0637e499ac9e [diff] | |
| parent | f1df0f59c174687b5f9a8ca0163fea3921915ae8 [diff] |
resolve merge conflicts of f1df0f59c1 to master. Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8