| commit | 610cf316a8751839359e0b3142c3e4e8e30d1446 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Thu Nov 12 13:07:56 2015 -0800 |
| committer | Ed Tam <etam@google.com> | Thu Nov 12 13:07:56 2015 -0800 |
| tree | 7eccb626246e360e75b4ed0bd154eebe235b305e | |
| parent | a5d6247bde8e2e1e0539752f122565da5f58bae8 [diff] | |
| parent | c45b2cc52570e47331b66bce80e9d4d1fabbb4bb [diff] |
resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. Change-Id: I6d5d44715aa7352eebaf925fb4bb33d69e8779fc