| commit | cd858e2dbdab4db4acf6ed973155a2b6b2a7f976 | [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 | e993bb4c8e685fb7278e53ed3ade0603fe2e4d07 [diff] | |
| parent | 7f18ef252333afdd498134625ee38d12b9ddbb04 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276