| commit | d5502258356402213692118941c968a4bf6a56d1 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Thu Nov 19 17:43:28 2015 -0800 |
| committer | Guang Zhu <guangzhu@google.com> | Thu Nov 19 17:43:28 2015 -0800 |
| tree | 341caafd879293697071efb0447e40f120fa8de4 | |
| parent | 57db2c0dc624e8f16fedfb0717b825959f648a69 [diff] | |
| parent | 723462eba9f3e421fb1c3955b0f45cb7c63d29bc [diff] |
resolve merge conflicts of 723462eba9 to master. Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f