| commit | 0567d8f68024925a9134d27da534799eb1eddc8d | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Fri Nov 08 15:42:02 2013 -0800 |
| committer | Stuart Scott <stuartscott@google.com> | Fri Nov 08 15:42:02 2013 -0800 |
| tree | e55fb167b0924ce4499ee6e94ca927550f25502e | |
| parent | b8476873a0609c3c383996a15875b3ef615bc937 [diff] | |
| parent | eee6081fc280e662a0ce9e32651c4e7635414f80 [diff] |
resolved conflicts for merge of eee6081f to master Change-Id: I822bd11e574c2eb7a61c6238322d70f15cca7301