| commit | cbc09e47a6cd9164219948caf848303ba19efbb9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 21 19:00:12 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed May 21 19:00:12 2014 -0700 |
| tree | 9c77581ad7520309c0bb90f11bba766a6cd61b28 | |
| parent | e348c5b72ad889389c7c1c900c121f0fbee221b5 [diff] | |
| parent | 58c26d9505db5e2768af03703b5f94647df34b6b [diff] |
resolved conflicts for merge of 58c26d95 to master Change-Id: I77fa04553f6decaf2ae4b27b866d76478c0e7038