| commit | ce14f1f40793e18998ffe70dffb725a85bd15fdf | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 31 14:31:44 2014 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Oct 31 14:31:44 2014 -0700 |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
| parent | 476d4de57bdc5592505e0c71e6d5ef65f4fdc70d [diff] | |
| parent | b8a3ce7833113135d7ce573aa52433351bb6e14b [diff] |
resolved conflicts for merge of b8a3ce78 to lmp-mr1-dev-plus-aosp