| commit | 57db2c0dc624e8f16fedfb0717b825959f648a69 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Nov 18 20:52:39 2015 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Wed Nov 18 20:52:39 2015 -0800 |
| tree | dcb9aa349cbbc74c0673852c19f46ed3791e1f91 | |
| parent | 072b1b5183bf3e193b20902b967fb3ecbbb175a3 [diff] | |
| parent | e3ad4409a6c094b7464ffada770463f677dfd013 [diff] |
resolve merge conflicts of e3ad4409a6 to master. Change-Id: Idc19d27ee359e5434d55d9a29ecdb4b1e30cbfe1