commit | b21f97d691e17749c094cd4bd83d533140dd5a51 | [log] [tgz] |
---|---|---|
author | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:12:34 2015 -0800 |
committer | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:12:34 2015 -0800 |
tree | 925685035ae440b6dac5e9cd56ba29c26067e7d6 | |
parent | e4247de36562d4713369b3c2042dc7e8339e429f [diff] | |
parent | 8cec13452b202b6eacab492194814d98d216f122 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276