| commit | c72c931eb8c5c336b9cb8b600b9e777ca169687c | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Fri Oct 16 16:25:40 2015 -0400 |
| committer | Julia Reynolds <juliacr@google.com> | Fri Oct 16 16:25:40 2015 -0400 |
| tree | 3ce737f1549e69bdcf148bc7b7fe2bab1c8ddc61 | |
| parent | 560bd7c7435fe858d4b8f8169a2d6450a5f51f09 [diff] | |
| parent | 429e7dcd09159464a7071d4814a4cc6db5466a65 [diff] |
resolved conflicts for 429e7dcd to master Change-Id: Id0aca75915a054253d032d333defba1a38b80abe