| commit | b70375abc2c4da6f868da4eef3d3f059acdf9774 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jan 16 14:42:35 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Thu Jan 16 14:42:35 2014 -0800 |
| tree | 52e04bc7cf0e003783006d488c7c6d276d500f45 | |
| parent | 24239a99ffde4a264be3121bff8b1ee70b78f63c [diff] | |
| parent | ec9e5891ac97c50cfb8d3d1c9c2d478637eff62b [diff] |
resolved conflicts for merge of ec9e5891 to master Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4