commit | 302fe53aeb1428ceeac6307ed69bf73db7f4a5c0 | [log] [tgz] |
---|---|---|
author | Dave Weinstein <olorin@google.com> | Tue Jun 14 11:05:01 2016 -0700 |
committer | Liisa Anttonen <liisa.anttonen@nedevicesw.com> | Wed Dec 14 09:46:40 2016 +0200 |
tree | 5ff4280889c016bc684c6dae3bc105a2e18a780d | |
parent | 9dd147b26c4936096becfbf0e9c3442dc9eeb089 [diff] |
Resolve a merge issue between lmp and lmp-mr1+ Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503 (cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0) (cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)