| commit | c1bb0c774afdfcea6fbed52a85abbffe15ef49b3 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Dec 04 18:41:24 2013 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Dec 04 18:41:24 2013 -0800 |
| tree | f0fcc75e1cefcc8abd4e53052938460fd22fde9a | |
| parent | dbbba1ad1f268d71d88b3540f7eeac0d314f9424 [diff] | |
| parent | 9c7281fbb21d3552c1f5540ecbf4d66dbb63cbee [diff] |
resolved conflicts for merge of 9c7281fb to master Change-Id: Ibbcb5cdc46d6d7e1a5bf12d090717f11b26b7308