Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
Alex Cheung [Wed, 23 Dec 2015 22:50:39 +0000 (14:50 -0800)]

Trivial merge