| commit | 054d78497e129e5dea545e7ea76692aec1bb387f | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jan 07 13:21:20 2014 -0600 |
| committer | Xavier Ducrohet <xav@android.com> | Tue Jan 07 13:21:20 2014 -0600 |
| tree | de40fcd88feb31fefc59609c9136682d618389b8 | |
| parent | 39c7e520bc9df1907ceff3020ce8a80348baa341 [diff] | |
| parent | 7d85d0a99c296397bcf991426b6883417708cd6c [diff] |
resolved conflicts for merge of 7d85d0a9 to master Change-Id: Ib04573eb46878537c5135d09dc62ee753377ec14