| commit | 924d06a0755fdbdd90883f3fcc16b837f00362d1 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Tue Apr 21 08:00:49 2015 -0700 |
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | Tue Apr 21 08:00:49 2015 -0700 |
| tree | 238f64fbf07ce214cff3e8d4e1baf8c3d3a960e3 | |
| parent | 391ecffed91200a5c48f0388ce494d70cc86fc37 [diff] | |
| parent | b423a6b21293e2609268b3f430d3dedec0b68b3f [diff] |
Merge "Resolve configuration conflict"