| commit | cb489f61b873a8956dc85f8560d05ab4f631f87c | [log] [tgz] |
|---|---|---|
| author | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:13:50 2015 -0800 |
| committer | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:13:50 2015 -0800 |
| tree | d9fd2a2d0033285bb7980cd39cf6c7bc9f4851f4 | |
| parent | e81a187acb0b7c4245be74021728c5864baf5269 [diff] | |
| parent | e4b9d1d4a5f03abed7ed64f1b69f1d7fd79f0397 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276