| commit | 2bed01ce6f1a3e24adba3da845d894e57f231cfc | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Fri Dec 19 12:52:14 2014 -0800 |
| committer | Raymond Chiu <chiur@google.com> | Fri Dec 19 12:52:14 2014 -0800 |
| tree | 40052e012e5ab48e52f612b691df95ef116fd146 | |
| parent | f0d1fee0c5ed876cbf4ed681d3e74fd4af537696 [diff] | |
| parent | 0dac1454dbc1f79630e7e7e4c85aeebffaa2e41c [diff] |
resolve merge conflicts of 0dac145 to gradle-dev. Change-Id: I7985710b93e4e31afd0f10e8f5f32a40f5b0a93f