| commit | 068907be9704ca9267075ef9ba82b83f8fb3ae34 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue Apr 07 11:17:19 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Tue Apr 07 11:17:19 2015 -0700 |
| tree | 660911ba7662ebd2dd8d544bd1f909af79dea71d | |
| parent | 5c86c1f3e914a281284802e1c6ef7e5392f55768 [diff] | |
| parent | f838b76f755a3f2c280b5f6c445863ce48e8e679 [diff] |
resolved conflicts for merge of f838b76f to master Change-Id: I2ee8f2cc15f16b1e98112955d196dba96c38ef20