| commit | 00cd47a2d2147eaba031771fd7e8b6fdbf25cf46 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Sep 09 18:38:54 2015 -0700 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Sep 09 18:40:05 2015 -0700 |
| tree | 6c44151e41d25d15f1a2005dced3a7916a8fc3a6 | |
| parent | 2e846c25b3a414faa936248f81fc43a495d0d072 [diff] | |
| parent | 0fb3f695cc273d6c97e7d80c0ac25d8fac263d3a [diff] |
resolved conflicts for 0fb3f695 to master. Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a