OSDN Git Service

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:48:52 +0000 (14:48 -0800)
committerAlex Cheung <alexcheung@google.com>
Wed, 23 Dec 2015 22:48:52 +0000 (14:48 -0800)
commit39d1f6646a11971b63d9d58a8ffdda3d41d9953a
tree46323aa8604c7e778084cea3204a346520373332
parent784ac6c36b650694591aa8a6e54dcda73c9f1368
parenta2590b5e7fb8a4a26ea530e59b2b630acc112bd9
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276