| commit | b81d0835ac4bf0d4dd738c9f5102ffc9fea16d94 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Feb 04 15:43:05 2016 -0800 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Feb 04 15:43:05 2016 -0800 |
| tree | 00d103a3deaf9ac9b16f4dfd2927e59e53018091 | |
| parent | df674b1e9ea5d164d8950ae1b180e93142f6a963 [diff] | |
| parent | dc1afa9c0f47c413bea8c3232dce036a2dbb56f3 [diff] |
resolve merge conflicts of dc1afa9c0f to master. Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a