tree 7da78caaf636509f6cf6bae184734392a2998f81
parent 3a6e0d29c176481f4fac927d82fed4dfde112896
parent bcd60620c85de6c3b9ae941068a20a2cb14a87ad
author Alex Cheung <alexcheung@google.com> 1450910990 -0800
committer Alex Cheung <alexcheung@google.com> 1450910990 -0800

Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276