| commit | 72353f83ff4057a64ff1e5ae3bc4b90de93e6171 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Aug 21 14:57:18 2015 +0200 |
| committer | Yohann Roussel <yroussel@google.com> | Fri Aug 21 14:57:18 2015 +0200 |
| tree | 0e8708adb40d8ae98f063e9470e9540dc80eeadb | |
| parent | 010ac9716931a47686e3f818910102a1231d32c0 [diff] | |
| parent | ab01c96b3c21098dffbba03248f801486c76bdc7 [diff] |
resolved conflicts for merge of ab01c96b to lmp-mr1-dev Change-Id: Ie70b72005a6d3df47adb0e5b1b21b9d7b99b8ab0