| commit | 4d3a4132c2ee8fc90f9efc92ca422e936ddbd1bb | [log] [tgz] |
|---|---|---|
| author | Sungsoo <sungsoo@google.com> | Fri Oct 14 08:11:15 2016 +0900 |
| committer | Sungsoo <sungsoo@google.com> | Fri Oct 14 08:17:19 2016 +0900 |
| tree | fb63341aa75368470a62a18a116ba8401ffef413 | |
| parent | 1f195c70c9a02b08d5e40c65dc9e2e8089aeebec [diff] | |
| parent | 3fc6b8fd0f503bf0c1144ade856150d4ff02d18e [diff] |
resolve merge conflicts of 3fc6b8f to master Change-Id: I004b34699fd997805d6c37753c48fe1f1d226095