| commit | 6bd036374cf2c0eabf961d0da531778229f9cd3c | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Wed Jul 13 10:55:06 2016 +0900 |
| committer | Jaewan Kim <jaewan@google.com> | Wed Jul 13 10:55:06 2016 +0900 |
| tree | f0d6ed4d755b4710ce03f495413a102f5b4f9906 | |
| parent | 0d7175f59e08e45243778d5e01b97e0a8c0dd2a0 [diff] | |
| parent | 78120b017795cd0ff5f6cb24b2af1e4bba3b5a89 [diff] |
resolve merge conflicts of 78120b0 to nyc-mr1-dev-plus-aosp