| commit | d8111138abbffa452a34fb97eb94b1c0e3b3b4f7 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Jan 27 15:23:09 2015 -0800 |
| committer | Alan Viverette <alanv@google.com> | Tue Jan 27 15:23:09 2015 -0800 |
| tree | 8a78ac9ff282983aeaf6e78df87324de6a3eaebb | |
| parent | 783f28691e27b7b116730fad4f9fd9c083bab283 [diff] | |
| parent | e5743753eee8da6019594a95d2c27881599a0582 [diff] |
resolve merge conflicts of e5743753 to master. Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46