| commit | 3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Feb 06 06:30:50 2015 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Fri Feb 06 06:30:50 2015 -0800 |
| tree | 3fa1d28d277a2f38d975b8a3476fb46cf4d6fd6a | |
| parent | eac728dcf35de0f74f46c9b65bde43ab6361c176 [diff] | |
| parent | ca50950615848b02bee9ab5f2463ede6cc016bf0 [diff] |
resolved conflicts for merge of ca509506 to master Change-Id: I93a81bf167407307f209cf46249a8d65d26589f3