| commit | e48da96ab5837f305ef55d5ea9d3215930884f83 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Fri Apr 12 11:00:21 2013 -0700 |
| committer | Romain Guy <romainguy@google.com> | Fri Apr 12 11:00:21 2013 -0700 |
| tree | 5214cff0008ca7a523610408c214091240fd5078 | |
| parent | 28da13494b69cd0f504d3745caa0368f2b9f979b [diff] | |
| parent | 886e120460914746496c2877e7a56f2adfb37d2f [diff] |
resolved conflicts for merge of 886e1204 to master Change-Id: Id002d2ae799c6946672335f122ecbfa07d9c0bc1