| commit | a6bf300101846c135ed26c10c8a65d625b8fe820 | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Tue Apr 07 22:30:37 2015 +0200 |
| committer | Benoit Lamarche <benoitlamarche@google.com> | Tue Apr 07 22:30:37 2015 +0200 |
| tree | 9f954d1838fee56625603f09cd0e93c011c32d4c | |
| parent | 5ff9033e90312d50947453dfcc4b4a9c9f46f35b [diff] | |
| parent | ab1774c05909eb572ca607c20aa2831a884e10a5 [diff] |
resolved conflicts for merge of ab1774c0 to lmp-mr1-dev-plus-aosp Change-Id: I906a5fa2ecbdc43656dd64098f38cdf60438e1e3