| commit | 3a4922bb427a4b600c7161c9d9019d9348837e4f | [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 | c15fe7661f9a0759d58a616139fe401e53eb72d8 | |
| parent | cbc9dc0a22b6294a47d97300870a5835a861efa7 [diff] | |
| parent | 3bf8675f5f922522069e12eafd5196518a52635d [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276