| commit | ac038f3b69724647e9ff7b115eea77d442c9d0f5 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Apr 01 15:57:17 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Apr 01 15:57:17 2015 -0700 |
| tree | b5d669d0830c9c8c22cf079a6d2c2650c4e2f3bc | |
| parent | bb664e12e2539c4e8121764a891e000d52e9664f [diff] | |
| parent | 844e44c96ddb9e0167ff6dad3b7924aef29586f3 [diff] |
resolved conflicts for merge of 844e44c9 to master Change-Id: I8f682da1a50151547f01b4d3a949852525fe6299