| commit | 209068274746706a05371a4bebdc8701b31ce7ea | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Thu Jan 14 14:09:15 2016 -0800 |
| committer | Prashant Malani <pmalani@google.com> | Thu Jan 14 14:09:15 2016 -0800 |
| tree | d1dd268617acd61bd5f5a1931cee56c1280005d8 | |
| parent | fd183a7e883a41d1f260b471ccca14530928874e [diff] | |
| parent | dccc83fc45fc05845a1fca2ac46878dba742b6e6 [diff] |
resolve merge conflicts of dccc83fc45 to master. Change-Id: Iecb0e1e9176a9bd23937dca97ebc270b396d12ab