| commit | 25ac0502b063fdace9b01645a0c3867d276d7aaa | [log] [tgz] |
|---|---|---|
| author | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:06:20 2015 -0800 |
| committer | Alex Cheung <alexcheung@google.com> | Wed Dec 23 17:06:20 2015 -0800 |
| tree | 8da625471f3d7b8938da3a85116120b3f00188b2 | |
| parent | bb60fe9f06ebafd53ceea80a161eae9096a1d303 [diff] | |
| parent | e6479d578511e8055a34c2c460d92c28238abb50 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276