| commit | 980b106908cb8e105bb8849749722c5088e2f6eb | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 27 15:38:17 2015 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Tue Jan 27 15:38:17 2015 -0800 |
| tree | 0e5e837bd3f127e7af4caffc0e2ec83444466a83 | |
| parent | 5c2be9eddba74a503c55808816aa37cc8ce18c50 [diff] | |
| parent | 9391844deb3f6a442745cea62f78aca2cea19e50 [diff] |
resolved conflicts for merge of 9391844d to master Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111