| commit | a80ac05f85962949d5072831200d86a7023575fb | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 12 16:17:45 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Mar 12 16:17:45 2015 -0700 |
| tree | 38dc9f9fc058ff52ee76e2e82df9e01edccb6b6f | |
| parent | d58617b4f519e69cf8a828210f138d2bcbe4e20a [diff] | |
| parent | 42f55d1e689c510198b62a1747a5fd8f8dcbff9b [diff] |
resolved conflicts for merge of 42f55d1e to master Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec