| commit | 803faa182bbffad17bb354ef3ce6a521942af8f9 | [log] [tgz] |
|---|---|---|
| author | Alex Cheung <alexcheung@google.com> | Wed Dec 23 14:48:52 2015 -0800 |
| committer | Alex Cheung <alexcheung@google.com> | Wed Dec 23 14:48:52 2015 -0800 |
| tree | ac4aa363070bbc1c3e0edfe4410c8eeddc510e78 | |
| parent | 7c16024c8349396d18565654326e87a6ed291a92 [diff] | |
| parent | d64c967d37cef184fc9f699f8ba0c9d79d2a12e2 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276