Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
authorAlex Cheung <alexcheung@google.com>
Wed, 23 Dec 2015 22:50:39 +0000 (14:50 -0800)
committerAlex Cheung <alexcheung@google.com>
Wed, 23 Dec 2015 22:50:39 +0000 (14:50 -0800)
commit86f08020cca0000d722affa86536ff49dad01844
tree67770d2d9fd5b4d68d335fd730d54b56a0e1a0fc
parentc65739a4beb1868151a4495c0799486bc4c1baa2
parent144043c23a27ef1c35ac7b5d73b66c42722ccbe2
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276