| commit | 2b96d6ae782188dadcb08523e44b8c94bd7626d3 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Apr 22 10:03:16 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Tue Apr 22 10:03:16 2014 -0700 |
| tree | ccea0fc5351ed2e944c5bb623f51d84d7935f730 | |
| parent | 2290cbf811eae0703a462c158c2f25f08f7c2811 [diff] | |
| parent | 77efd7b4cdbcb9ffd12bc5289dc59ed95b544513 [diff] |
resolved conflicts for merge of 77efd7b4 to master Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f