| commit | e24780ed4ca05a3adf7114bcf4a95abaccd2f317 | [log] [tgz] |
|---|---|---|
| author | Dmitry Dementyev <dementyev@google.com> | Tue Mar 07 19:47:52 2017 -0800 |
| committer | Dmitry Dementyev <dementyev@google.com> | Tue Mar 07 19:52:02 2017 -0800 |
| tree | 22109ad518236eb6f28aa35d121b6ba1140367b9 | |
| parent | 56d630a3eda390d8514c1e1d9f36c95e7808d1dd [diff] | |
| parent | 75ae46d035ce600be3cac3ee597d5e379636fa42 [diff] |
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa Bug: 33123882 Test: manual tests: