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)
commit13d9e776e694836cfa1dccc0f4b9a61fd3c41f5c
tree8a515cd4e0f24860744d32c2fee0c2fb1513e94a
parent915e510b85c4aef69f22f88051571b5a9fb2dd29
parentdeb60d5f89dc91c0fe4eb3488ac2804f23ece1cd
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276