| commit | f5770d78da76ce49ca1ab8334874abdaa6cc7115 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jun 19 10:32:35 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Thu Jun 19 10:32:35 2014 -0700 |
| tree | 2c4a132b70ecb49a90677573a420a8cb18f0bbda | |
| parent | 50f0eab1cd6087b742f78134a2aaa6e786187b6c [diff] | |
| parent | 240e136efdd37b9a37df9e05d6996eb3232a9d22 [diff] |
resolved conflicts for merge of 240e136e to master Change-Id: Ic6e2cbe593914ddb613454581964c5d3d443b9d5