commit | 39d1f6646a11971b63d9d58a8ffdda3d41d9953a | [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 | 46323aa8604c7e778084cea3204a346520373332 | |
parent | 784ac6c36b650694591aa8a6e54dcda73c9f1368 [diff] | |
parent | a2590b5e7fb8a4a26ea530e59b2b630acc112bd9 [diff] |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276