| commit | 67cac553b0f8883a93b9ab65ddbdc413bb6d5765 | [log] [tgz] |
|---|---|---|
| author | John Shao <johnshao@google.com> | Tue Dec 20 17:55:57 2016 -0800 |
| committer | John Shao <johnshao@google.com> | Tue Dec 20 17:55:57 2016 -0800 |
| tree | f740d668ba7dfce377f51c9e85fa0e21a7554588 | |
| parent | 32e956b37a609cbfba285176696bde05fda7094f [diff] | |
| parent | c9c2c45e694e7dd0cf1b2dc1a1c5c1a9a56c44c9 [diff] |
resolve merge conflicts of c9c2c45 to master Change-Id: I9efc8e7181cb4d2802cf860d68e6a0cad06c9e8e