| commit | d51b1b247b120c7e49851d923f3c5aa0aa19a787 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Feb 26 15:13:30 2016 -0800 |
| committer | Jean-Michel Trivi <jmtrivi@google.com> | Fri Feb 26 15:13:30 2016 -0800 |
| tree | b228978bfcb786af075bedaf906908af2ee194b4 | |
| parent | b2396a3991f726f96499ff479737ad7f51f21b86 [diff] | |
| parent | 1e9a65df13859b44b91610ef4cc721155ab5eaa8 [diff] |
resolve merge conflicts of 1e9a65df13 to master Change-Id: I7c255d7813805b5ffb0d8e5ecd6fc11ee0b80c8a