| commit | 00d77c918847afb570a38adefc03e6272b63b0ab | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Wed Apr 08 18:29:35 2015 +0200 |
| committer | Benoit Lamarche <benoitlamarche@google.com> | Wed Apr 08 18:29:35 2015 +0200 |
| tree | de4dde2095021b2d05d40b53efdf6cc4a3ff630a | |
| parent | a6bf300101846c135ed26c10c8a65d625b8fe820 [diff] | |
| parent | 6be6ed44fd274b9579c8fbe0aacffe1c32ef2d35 [diff] |
resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aosp Change-Id: Id603b84943b1cb244b69272b4c8607a520c517b2