| commit | 969158a964dde085a0b14b3ab75dcb3dd52da04e | [log] [tgz] |
|---|---|---|
| author | Sungsoo <sungsoo@google.com> | Wed Jan 25 11:18:35 2017 +0900 |
| committer | Sungsoo <sungsoo@google.com> | Wed Jan 25 11:18:35 2017 +0900 |
| tree | 21d7bab21463ae1077cfe3a432ad77e52eafb753 | |
| parent | c42e912936e87bfbb5976cd42bbda8b5b9207e3b [diff] | |
| parent | d186d6ee814d0bbd7911c4dfbc7e2964a7837a31 [diff] |
resolve merge conflicts of d186d6ee81 to master Change-Id: I97583d2bf7f6c8ab36173e4a8a98c3950e9c9bbc