commit | d2e3c6e24e0c68fac0aad29a7267a62d00e5f388 | [log] [tgz] |
---|---|---|
author | Alex Cheung <alexcheung@google.com> | Wed Dec 23 14:42:15 2015 -0800 |
committer | Alex Cheung <alexcheung@google.com> | Wed Dec 23 14:42:15 2015 -0800 |
tree | 69d415d7b30d5191f1e4ac6f50e2ded5097c07ca | |
parent | f09b468fccc251b4907c69d9d68bdec07535a33f [diff] | |
parent | 66e74758b9e533237d1fa962b11514fc1824618a [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276