OSDN Git Service

Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
authorAlex Cheung <alexcheung@google.com>
Thu, 24 Dec 2015 00:40:53 +0000 (16:40 -0800)
committerAlex Cheung <alexcheung@google.com>
Thu, 24 Dec 2015 00:40:53 +0000 (16:40 -0800)

Trivial merge