| commit | e5da16d7ddc58b4f84e87b155a3210d651dd689d | [log] [tgz] |
|---|---|---|
| author | Sungsoo <sungsoo@google.com> | Mon Dec 05 15:16:02 2016 +0900 |
| committer | Sungsoo <sungsoo@google.com> | Mon Dec 05 15:18:38 2016 +0900 |
| tree | d1b189738b44cb6901b63b7f48bb762c9aa11c30 | |
| parent | e4ba777a182f076d020a78ee667baf547eebe596 [diff] | |
| parent | a0f3e642a4c502e7b03b7466edefc6d544cfbcb2 [diff] |
resolve merge conflicts of a0f3e64 to master Change-Id: I777a4410f89a8cc35db76ae0c98e54aee68703ad