| commit | cb9d7a96bb60034e04ee4fa38d61161a3c273687 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Sep 09 18:48:27 2015 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Sep 09 18:48:27 2015 -0700 |
| tree | a8ddd71a5d3e3e9227130ad1ef9cb939063cfb5f | |
| parent | 3fac92ff7eaff75e66a9b12da4ee89aaf2893823 [diff] | |
| parent | 99bbec733d8ad558fe4a874cefac45961c48d9c3 [diff] |
resolved conflicts for 99bbec73 to master Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb