| commit | 1b4e56ac36c4d01e1ab4d95bb80888c6b80d0fd3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Mar 13 00:17:40 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Fri Mar 13 00:17:40 2015 -0700 |
| tree | 3048f2b214251714e7b9d92c002125a3b162783c | |
| parent | ce389e00cf365c5b0beb986472b4b39683adbe91 [diff] | |
| parent | 1d67698bb4c67ffa934d45edf7d5415d582a3c90 [diff] |
resolved conflicts for merge of 1d67698b to master Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b