| commit | 0529672a8cffd2abb749265ddeb703a179c34662 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Oct 29 09:05:53 2015 -0700 |
| committer | John Reck <jreck@google.com> | Thu Oct 29 09:05:53 2015 -0700 |
| tree | dc97e264036a0dc3d5f759ce33d9adce9539b8cc | |
| parent | d8f56833c593320d51b6314f06ee1a3fedd92e97 [diff] | |
| parent | a1b8d77ca3ea6cc5e851dce8701785524e3049eb [diff] |
resolve merge conflicts of a1b8d77ca3 to master. Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5